The open source simple and complete warehouse management system is derived from our many years of experience in implementing erp projects. We stripped the original commercial system wms function and opened it up for free, hoping to help the majority of small and medium-sized enterprises. At present, the system supports cross-platform。
feat(): WMS 1.0 final version
liufu28bd6e6d5d0a
diff --git a/frontend/.env.production b/frontend/.env.productionindex 976e6f0..b83b2cf 100644--- a/frontend/.env.production+++ b/frontend/.env.production@@ -3,4 +3,4 @@ ENV = 'production'VITE_CLI_PORT = 5174VITE_SERVER_PORT = 20011VITE_BASE_API = /api-VITE_BASE_PATH = http://127.0.0.1+VITE_BASE_PATH = http://127.0.0.1\ No newline at end of filediff --git a/frontend/index.html b/frontend/index.htmlindex 4253a1b..15bdd4a 100644--- a/frontend/index.html+++ b/frontend/index.html@@ -5,6 +5,9 @@<meta name="viewport" content="width=device-width, initial-scale=1.0" /><title>ModernWMS</title><link rel="icon" href="./src/assets/img/webLogoMini.png" />+ <!-- hiprint 拖拽图标需要 -->+ <link rel="stylesheet" type="text/css" media="print" href="/bootstrap.min.css">+ <link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"></head><body>diff --git a/frontend/package-lock.json b/frontend/package-lock.jsonindex 338e7c8..b9b8666 100644--- a/frontend/package-lock.json+++ b/frontend/package-lock.json@@ -64,6 +64,26 @@"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz","integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="},+ "@babel/runtime": {+ "version": "7.22.15",+ "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.15.tgz",+ "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",+ "requires": {+ "regenerator-runtime": "^0.14.0"+ },+ "dependencies": {+ "regenerator-runtime": {+ "version": "0.14.0",+ "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",+ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="+ }+ }+ },+ "@claviska/jquery-minicolors": {+ "version": "2.3.6",+ "resolved": "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz",+ "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ=="+ },"@esbuild/android-arm": {"version": "0.16.4","resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.4.tgz",@@ -218,6 +238,47 @@"dev": true,"optional": true},+ "@fast-csv/format": {+ "version": "4.3.5",+ "resolved": "https://registry.npmmirror.com/@fast-csv/format/-/format-4.3.5.tgz",+ "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==",+ "requires": {+ "@types/node": "^14.0.1",+ "lodash.escaperegexp": "^4.1.2",+ "lodash.isboolean": "^3.0.3",+ "lodash.isequal": "^4.5.0",+ "lodash.isfunction": "^3.0.9",+ "lodash.isnil": "^4.0.0"+ },+ "dependencies": {+ "@types/node": {+ "version": "14.18.54",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz",+ "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw=="+ }+ }+ },+ "@fast-csv/parse": {+ "version": "4.3.6",+ "resolved": "https://registry.npmmirror.com/@fast-csv/parse/-/parse-4.3.6.tgz",+ "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==",+ "requires": {+ "@types/node": "^14.0.1",+ "lodash.escaperegexp": "^4.1.2",+ "lodash.groupby": "^4.6.0",+ "lodash.isfunction": "^3.0.9",+ "lodash.isnil": "^4.0.0",+ "lodash.isundefined": "^3.0.1",+ "lodash.uniq": "^4.5.0"+ },+ "dependencies": {+ "@types/node": {+ "version": "14.18.54",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz",+ "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw=="+ }+ }+ },"@iconify/types": {"version": "2.0.0","resolved": "https://registry.npmmirror.com/@iconify/types/-/types-2.0.0.tgz",@@ -329,6 +390,11 @@"picomatch": "^2.3.1"}},+ "@socket.io/component-emitter": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",+ "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="+ },"@types/estree": {"version": "1.0.0","resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.0.tgz",@@ -353,6 +419,11 @@"integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w==","dev": true},+ "@types/raf": {+ "version": "3.4.0",+ "resolved": "https://registry.npmmirror.com/@types/raf/-/raf-3.4.0.tgz",+ "integrity": "sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw=="+ },"@types/semver": {"version": "7.3.13","resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",@@ -464,42 +535,42 @@"dev": true},"@volar/language-core": {- "version": "1.0.12",- "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-1.0.12.tgz",- "integrity": "sha512-I9wylkEq5Fhv4uIxXq4ys+GKVAxKY64DEw1nj8oP36xaOl80r6ogZ9V3BCKJp/npAlFCH7pAkUDSBkSo8v3Tfg==",+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.0.11.tgz",+ "integrity": "sha512-YwUYKxIyDc+Fq3kQ6BGGfkrKCG5JzE2Yr6vMxrxEXW2rg/gsq3JgMk/4sI8ybRsaTirhCB4V8+AIVYsvcRxgig==","dev": true,"requires": {- "@volar/source-map": "1.0.12",+ "@volar/source-map": "1.0.11","@vue/reactivity": "^3.2.45","muggle-string": "^0.1.0"}},"@volar/source-map": {- "version": "1.0.12",- "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-1.0.12.tgz",- "integrity": "sha512-5npjYmotdIIerchOn9QwGHM7LBNJLWAjPBMrZnvv1MbqTwAxu2H1+MNh/cvLeIcrzNSYui81RZsMaPKTRiiXyg==",+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.0.11.tgz",+ "integrity": "sha512-tkuV9MD+OuiZfHA0qZXrPdW6F7TvnpnuTan6Qe7UGUs9+sflezlMJdjaYdGgQObfP+06pcT1E3xdkOoi08ZyyQ==","dev": true,"requires": {"muggle-string": "^0.1.0"}},"@volar/typescript": {- "version": "1.0.12",- "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-1.0.12.tgz",- "integrity": "sha512-7PR4Fwg3EyuwmagodaGntKxDqzie5Ywiq7evx5UvNIY0BP3yXrCADxBMFYLJykb+ECSE+GbTClsyXTnJQ9xi1Q==",+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-1.0.11.tgz",+ "integrity": "sha512-mq7wDDAs0Eb43jev2FxbowuiwWqvL3kb+tar1we8VQbdabpyQ5dmbWPwo/IglevMmW3SKo1Et+6rqAeZpXNnPQ==","dev": true,"requires": {- "@volar/language-core": "1.0.12"+ "@volar/language-core": "1.0.11"}},"@volar/vue-language-core": {- "version": "1.0.12",- "resolved": "https://registry.npmjs.org/@volar/vue-language-core/-/vue-language-core-1.0.12.tgz",- "integrity": "sha512-2JnKRwTJZxAHwFiaQmp79GwyAzf2UPOSnAe6QfOCTQvQ79iNj/zdzDjSzogeuwkCgrG8GHgaMiuWZx4xIXgTIQ==",+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/@volar/vue-language-core/-/vue-language-core-1.0.11.tgz",+ "integrity": "sha512-A3ODs0/ua7BcpSSnE7KtO8bzWsYsbOJRyW2Q/2uktxlfHj8srln3JdgK/mNlIgfnWtACbE5K+EfMJOgJKv864A==","dev": true,"requires": {- "@volar/language-core": "1.0.12",- "@volar/source-map": "1.0.12",+ "@volar/language-core": "1.0.11",+ "@volar/source-map": "1.0.11","@vue/compiler-dom": "^3.2.45","@vue/compiler-sfc": "^3.2.45","@vue/reactivity": "^3.2.45",@@ -509,13 +580,13 @@}},"@volar/vue-typescript": {- "version": "1.0.12",- "resolved": "https://registry.npmjs.org/@volar/vue-typescript/-/vue-typescript-1.0.12.tgz",- "integrity": "sha512-MhdZmUlvl54w2rsPXEtwbX7dq1Dya7THFcDof7vNaH3PwBxqnDn8SZS1Yoxe3pENuAXNwQskAc2uP9R9LYe36g==",+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/@volar/vue-typescript/-/vue-typescript-1.0.11.tgz",+ "integrity": "sha512-jlnFPvBcTyPiAbGlgjhKK7fp3Q+Z7Z5eU1NTbTSS0lQC8Gog3sh2UxLAFG5Voe1gHIxasoOEPXzMR0CWF4bKbA==","dev": true,"requires": {- "@volar/typescript": "1.0.12",- "@volar/vue-language-core": "1.0.12"+ "@volar/typescript": "1.0.11",+ "@volar/vue-language-core": "1.0.11"}},"@vue/compiler-core": {@@ -634,6 +705,11 @@"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==","dev": true},+ "adler-32": {+ "version": "1.3.1",+ "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",+ "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="+ },"ajv": {"version": "6.12.6","resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",@@ -688,6 +764,53 @@"picomatch": "^2.0.4"}},+ "archiver": {+ "version": "5.3.1",+ "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",+ "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",+ "requires": {+ "archiver-utils": "^2.1.0",+ "async": "^3.2.3",+ "buffer-crc32": "^0.2.1",+ "readable-stream": "^3.6.0",+ "readdir-glob": "^1.0.0",+ "tar-stream": "^2.2.0",+ "zip-stream": "^4.1.0"+ }+ },+ "archiver-utils": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-2.1.0.tgz",+ "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",+ "requires": {+ "glob": "^7.1.4",+ "graceful-fs": "^4.2.0",+ "lazystream": "^1.0.0",+ "lodash.defaults": "^4.2.0",+ "lodash.difference": "^4.5.0",+ "lodash.flatten": "^4.4.0",+ "lodash.isplainobject": "^4.0.6",+ "lodash.union": "^4.6.0",+ "normalize-path": "^3.0.0",+ "readable-stream": "^2.0.0"+ },+ "dependencies": {+ "readable-stream": {+ "version": "2.3.8",+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",+ "requires": {+ "core-util-is": "~1.0.0",+ "inherits": "~2.0.3",+ "isarray": "~1.0.0",+ "process-nextick-args": "~2.0.0",+ "safe-buffer": "~5.1.1",+ "string_decoder": "~1.1.1",+ "util-deprecate": "~1.0.1"+ }+ }+ }+ },"argparse": {"version": "1.0.10","resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",@@ -734,11 +857,21 @@"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==","dev": true},+ "async": {+ "version": "3.2.4",+ "resolved": "https://registry.npmmirror.com/async/-/async-3.2.4.tgz",+ "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="+ },"asynckit": {"version": "0.4.0","resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz","integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="},+ "atob": {+ "version": "2.1.2",+ "resolved": "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz",+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="+ },"axios": {"version": "1.2.1","resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",@@ -752,8 +885,31 @@"balanced-match": {"version": "1.0.2","resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",- "dev": true+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="+ },+ "base64-arraybuffer": {+ "version": "1.0.2",+ "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",+ "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="+ },+ "base64-js": {+ "version": "1.5.1",+ "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="+ },+ "big-integer": {+ "version": "1.6.51",+ "resolved": "https://registry.npmmirror.com/big-integer/-/big-integer-1.6.51.tgz",+ "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="+ },+ "binary": {+ "version": "0.3.0",+ "resolved": "https://registry.npmmirror.com/binary/-/binary-0.3.0.tgz",+ "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",+ "requires": {+ "buffers": "~0.1.1",+ "chainsaw": "~0.1.0"+ }},"binary-extensions": {"version": "2.2.0",@@ -761,11 +917,25 @@"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==","dev": true},+ "bl": {+ "version": "4.1.0",+ "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",+ "requires": {+ "buffer": "^5.5.0",+ "inherits": "^2.0.4",+ "readable-stream": "^3.4.0"+ }+ },+ "bluebird": {+ "version": "3.4.7",+ "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.4.7.tgz",+ "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="+ },"brace-expansion": {"version": "2.0.1","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz","integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",- "dev": true,"requires": {"balanced-match": "^1.0.0"}@@ -779,6 +949,35 @@"fill-range": "^7.0.1"}},+ "btoa": {+ "version": "1.2.1",+ "resolved": "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz",+ "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="+ },+ "buffer": {+ "version": "5.7.1",+ "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",+ "requires": {+ "base64-js": "^1.3.1",+ "ieee754": "^1.1.13"+ }+ },+ "buffer-crc32": {+ "version": "0.2.13",+ "resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz",+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="+ },+ "buffer-indexof-polyfill": {+ "version": "1.0.2",+ "resolved": "https://registry.npmmirror.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",+ "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="+ },+ "buffers": {+ "version": "0.1.1",+ "resolved": "https://registry.npmmirror.com/buffers/-/buffers-0.1.1.tgz",+ "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="+ },"call-bind": {"version": "1.0.2","resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",@@ -795,6 +994,38 @@"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==","dev": true},+ "canvg": {+ "version": "3.0.10",+ "resolved": "https://registry.npmmirror.com/canvg/-/canvg-3.0.10.tgz",+ "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",+ "requires": {+ "@babel/runtime": "^7.12.5",+ "@types/raf": "^3.4.0",+ "core-js": "^3.8.3",+ "raf": "^3.4.1",+ "regenerator-runtime": "^0.13.7",+ "rgbcolor": "^1.0.1",+ "stackblur-canvas": "^2.0.0",+ "svg-pathdata": "^6.0.3"+ }+ },+ "cfb": {+ "version": "1.2.2",+ "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",+ "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",+ "requires": {+ "adler-32": "~1.3.0",+ "crc-32": "~1.2.0"+ }+ },+ "chainsaw": {+ "version": "0.1.0",+ "resolved": "https://registry.npmmirror.com/chainsaw/-/chainsaw-0.1.0.tgz",+ "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",+ "requires": {+ "traverse": ">=0.3.0 <0.4"+ }+ },"chalk": {"version": "4.1.2","resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",@@ -883,6 +1114,11 @@"integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==","dev": true},+ "codepage": {+ "version": "1.15.0",+ "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",+ "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="+ },"color-convert": {"version": "1.9.3","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",@@ -906,11 +1142,21 @@"delayed-stream": "~1.0.0"}},+ "compress-commons": {+ "version": "4.1.1",+ "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",+ "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",+ "requires": {+ "buffer-crc32": "^0.2.13",+ "crc32-stream": "^4.0.2",+ "normalize-path": "^3.0.0",+ "readable-stream": "^3.6.0"+ }+ },"concat-map": {"version": "0.0.1","resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",- "dev": true+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="},"confusing-browser-globals": {"version": "1.0.11",@@ -927,6 +1173,30 @@"is-what": "^3.14.1"}},+ "core-js": {+ "version": "3.32.1",+ "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.32.1.tgz",+ "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ=="+ },+ "core-util-is": {+ "version": "1.0.3",+ "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="+ },+ "crc-32": {+ "version": "1.2.2",+ "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",+ "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="+ },+ "crc32-stream": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz",+ "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",+ "requires": {+ "crc-32": "^1.2.0",+ "readable-stream": "^3.4.0"+ }+ },"cross-spawn": {"version": "7.0.3","resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",@@ -938,14 +1208,27 @@"which": "^2.0.1"}},+ "css-line-break": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",+ "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",+ "requires": {+ "utrie": "^1.0.2"+ }+ },"csstype": {"version": "2.6.21","resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz","integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="},+ "dayjs": {+ "version": "1.11.9",+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.9.tgz",+ "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA=="+ },"de-indent": {"version": "1.0.2",- "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",+ "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz","integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==","dev": true},@@ -953,11 +1236,18 @@"version": "4.3.4","resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz","integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",- "dev": true,"requires": {"ms": "2.1.2"}},+ "decompress-response": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",+ "requires": {+ "mimic-response": "^3.1.0"+ }+ },"deep-is": {"version": "0.1.4","resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",@@ -1002,12 +1292,67 @@"esutils": "^2.0.2"}},+ "dompurify": {+ "version": "2.4.7",+ "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-2.4.7.tgz",+ "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==",+ "optional": true+ },+ "duplexer2": {+ "version": "0.1.4",+ "resolved": "https://registry.npmmirror.com/duplexer2/-/duplexer2-0.1.4.tgz",+ "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",+ "requires": {+ "readable-stream": "^2.0.2"+ },+ "dependencies": {+ "readable-stream": {+ "version": "2.3.8",+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",+ "requires": {+ "core-util-is": "~1.0.0",+ "inherits": "~2.0.3",+ "isarray": "~1.0.0",+ "process-nextick-args": "~2.0.0",+ "safe-buffer": "~5.1.1",+ "string_decoder": "~1.1.1",+ "util-deprecate": "~1.0.1"+ }+ }+ }+ },"emoji-regex": {"version": "8.0.0","resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz","integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==","dev": true},+ "end-of-stream": {+ "version": "1.4.4",+ "resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz",+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",+ "requires": {+ "once": "^1.4.0"+ }+ },+ "engine.io-client": {+ "version": "6.5.2",+ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz",+ "integrity": "sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==",+ "requires": {+ "@socket.io/component-emitter": "~3.1.0",+ "debug": "~4.3.1",+ "engine.io-parser": "~5.2.1",+ "ws": "~8.11.0",+ "xmlhttprequest-ssl": "~2.0.0"+ }+ },+ "engine.io-parser": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",+ "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ=="+ },"errno": {"version": "0.1.8","resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",@@ -1481,6 +1826,40 @@"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==","dev": true},+ "exceljs": {+ "version": "4.3.0",+ "resolved": "https://registry.npmmirror.com/exceljs/-/exceljs-4.3.0.tgz",+ "integrity": "sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==",+ "requires": {+ "archiver": "^5.0.0",+ "dayjs": "^1.8.34",+ "fast-csv": "^4.3.1",+ "jszip": "^3.5.0",+ "readable-stream": "^3.6.0",+ "saxes": "^5.0.1",+ "tmp": "^0.2.0",+ "unzipper": "^0.10.11",+ "uuid": "^8.3.0"+ },+ "dependencies": {+ "rimraf": {+ "version": "3.0.2",+ "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",+ "requires": {+ "glob": "^7.1.3"+ }+ },+ "tmp": {+ "version": "0.2.1",+ "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.2.1.tgz",+ "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",+ "requires": {+ "rimraf": "^3.0.0"+ }+ }+ }+ },"execa": {"version": "5.1.1","resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",@@ -1509,6 +1888,15 @@"tmp": "^0.0.33"}},+ "fast-csv": {+ "version": "4.3.6",+ "resolved": "https://registry.npmmirror.com/fast-csv/-/fast-csv-4.3.6.tgz",+ "integrity": "sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==",+ "requires": {+ "@fast-csv/format": "4.3.5",+ "@fast-csv/parse": "4.3.6"+ }+ },"fast-deep-equal": {"version": "3.1.3","resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",@@ -1549,6 +1937,11 @@"reusify": "^1.0.4"}},+ "fflate": {+ "version": "0.4.8",+ "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.4.8.tgz",+ "integrity": "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="+ },"figures": {"version": "3.2.0","resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",@@ -1618,11 +2011,20 @@"mime-types": "^2.1.12"}},+ "frac": {+ "version": "1.1.2",+ "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",+ "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="+ },+ "fs-constants": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="+ },"fs.realpath": {"version": "1.0.0","resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",- "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",- "dev": true+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="},"fsevents": {"version": "2.3.2",@@ -1631,6 +2033,17 @@"dev": true,"optional": true},+ "fstream": {+ "version": "1.0.12",+ "resolved": "https://registry.npmmirror.com/fstream/-/fstream-1.0.12.tgz",+ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",+ "requires": {+ "graceful-fs": "^4.1.2",+ "inherits": "~2.0.0",+ "mkdirp": ">=0.5 0",+ "rimraf": "2"+ }+ },"function-bind": {"version": "1.1.1","resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",@@ -1692,7 +2105,6 @@"version": "7.2.3","resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz","integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",- "dev": true,"requires": {"fs.realpath": "^1.0.0","inflight": "^1.0.4",@@ -1706,7 +2118,6 @@"version": "1.1.11","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz","integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",- "dev": true,"requires": {"balanced-match": "^1.0.0","concat-map": "0.0.1"@@ -1716,7 +2127,6 @@"version": "3.1.2","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz","integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",- "dev": true,"requires": {"brace-expansion": "^1.1.7"}@@ -1767,9 +2177,7 @@"graceful-fs": {"version": "4.2.10","resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",- "dev": true,- "optional": true+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="},"has": {"version": "1.0.3",@@ -1818,10 +2226,19 @@},"he": {"version": "1.2.0",- "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",+ "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz","integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==","dev": true},+ "html2canvas": {+ "version": "1.4.1",+ "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",+ "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",+ "requires": {+ "css-line-break": "^2.1.0",+ "text-segmentation": "^1.0.3"+ }+ },"human-signals": {"version": "2.1.0","resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",@@ -1837,6 +2254,11 @@"safer-buffer": ">= 2.1.2 < 3"}},+ "ieee754": {+ "version": "1.2.1",+ "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="+ },"ignore": {"version": "5.2.1","resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",@@ -1850,6 +2272,11 @@"dev": true,"optional": true},+ "immediate": {+ "version": "3.0.6",+ "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz",+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="+ },"import-fresh": {"version": "3.3.0","resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",@@ -1870,7 +2297,6 @@"version": "1.0.6","resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz","integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",- "dev": true,"requires": {"once": "^1.3.0","wrappy": "1"@@ -1879,8 +2305,7 @@"inherits": {"version": "2.0.4","resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",- "dev": true+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="},"inquirer": {"version": "7.3.3",@@ -2066,12 +2491,27 @@"integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==","dev": true},+ "isarray": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="+ },"isexe": {"version": "2.0.0","resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz","integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==","dev": true},+ "jquery": {+ "version": "3.7.1",+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",+ "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="+ },+ "js-binary-schema-parser": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/js-binary-schema-parser/-/js-binary-schema-parser-2.0.3.tgz",+ "integrity": "sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg=="+ },"js-tokens": {"version": "4.0.0","resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",@@ -2088,6 +2528,11 @@"esprima": "^4.0.0"}},+ "jsbarcode": {+ "version": "3.11.5",+ "resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.5.tgz",+ "integrity": "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA=="+ },"json-schema-traverse": {"version": "0.4.1","resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",@@ -2115,6 +2560,48 @@"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==","dev": true},+ "jspdf": {+ "version": "2.5.1",+ "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.1.tgz",+ "integrity": "sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==",+ "requires": {+ "@babel/runtime": "^7.14.0",+ "atob": "^2.1.2",+ "btoa": "^1.2.1",+ "canvg": "^3.0.6",+ "core-js": "^3.6.0",+ "dompurify": "^2.2.0",+ "fflate": "^0.4.8",+ "html2canvas": "^1.0.0-rc.5"+ }+ },+ "jszip": {+ "version": "3.10.1",+ "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",+ "requires": {+ "lie": "~3.3.0",+ "pako": "~1.0.2",+ "readable-stream": "~2.3.6",+ "setimmediate": "^1.0.5"+ },+ "dependencies": {+ "readable-stream": {+ "version": "2.3.8",+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",+ "requires": {+ "core-util-is": "~1.0.0",+ "inherits": "~2.0.3",+ "isarray": "~1.0.0",+ "process-nextick-args": "~2.0.0",+ "safe-buffer": "~5.1.1",+ "string_decoder": "~1.1.1",+ "util-deprecate": "~1.0.1"+ }+ }+ }+ },"klona": {"version": "2.0.5","resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",@@ -2127,6 +2614,30 @@"integrity": "sha512-dLkz37Ab97HWMx9KTes3Tbi3D1ln9fCAy2zr2YVExJasDRPGRaKcoE4fycWNtnCAJfjFqe0cnY+f8KT2JePEXQ==","dev": true},+ "lazystream": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/lazystream/-/lazystream-1.0.1.tgz",+ "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",+ "requires": {+ "readable-stream": "^2.0.5"+ },+ "dependencies": {+ "readable-stream": {+ "version": "2.3.8",+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",+ "requires": {+ "core-util-is": "~1.0.0",+ "inherits": "~2.0.3",+ "isarray": "~1.0.0",+ "process-nextick-args": "~2.0.0",+ "safe-buffer": "~5.1.1",+ "string_decoder": "~1.1.1",+ "util-deprecate": "~1.0.1"+ }+ }+ }+ },"less": {"version": "4.1.3","resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz",@@ -2172,6 +2683,19 @@"type-check": "~0.4.0"}},+ "lie": {+ "version": "3.3.0",+ "resolved": "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz",+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",+ "requires": {+ "immediate": "~3.0.5"+ }+ },+ "listenercount": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/listenercount/-/listenercount-1.0.1.tgz",+ "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ=="+ },"local-pkg": {"version": "0.4.2","resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.2.tgz",@@ -2193,6 +2717,76 @@"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==","dev": true},+ "lodash.defaults": {+ "version": "4.2.0",+ "resolved": "https://registry.npmmirror.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz",+ "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="+ },+ "lodash.difference": {+ "version": "4.5.0",+ "resolved": "https://registry.npmmirror.com/lodash.difference/-/lodash.difference-4.5.0.tgz",+ "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="+ },+ "lodash.escaperegexp": {+ "version": "4.1.2",+ "resolved": "https://registry.npmmirror.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",+ "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="+ },+ "lodash.flatten": {+ "version": "4.4.0",+ "resolved": "https://registry.npmmirror.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz",+ "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="+ },+ "lodash.groupby": {+ "version": "4.6.0",+ "resolved": "https://registry.npmmirror.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz",+ "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw=="+ },+ "lodash.isboolean": {+ "version": "3.0.3",+ "resolved": "https://registry.npmmirror.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",+ "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="+ },+ "lodash.isequal": {+ "version": "4.5.0",+ "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",+ "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="+ },+ "lodash.isfunction": {+ "version": "3.0.9",+ "resolved": "https://registry.npmmirror.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",+ "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="+ },+ "lodash.isnil": {+ "version": "4.0.0",+ "resolved": "https://registry.npmmirror.com/lodash.isnil/-/lodash.isnil-4.0.0.tgz",+ "integrity": "sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng=="+ },+ "lodash.isplainobject": {+ "version": "4.0.6",+ "resolved": "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",+ "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="+ },+ "lodash.isundefined": {+ "version": "3.0.1",+ "resolved": "https://registry.npmmirror.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz",+ "integrity": "sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA=="+ },+ "lodash.union": {+ "version": "4.6.0",+ "resolved": "https://registry.npmmirror.com/lodash.union/-/lodash.union-4.6.0.tgz",+ "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="+ },+ "lodash.uniq": {+ "version": "4.5.0",+ "resolved": "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz",+ "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="+ },+ "lottie-web": {+ "version": "5.10.1",+ "resolved": "https://registry.npmmirror.com/lottie-web/-/lottie-web-5.10.1.tgz",+ "integrity": "sha512-u17bVNf/vA3oK9Wkyb1Vpo83WUIEQwaT0GeEN0qcvaExizyJ/RjmcbjSDj0CnwQCtpGqTgYhqprCC7cTWuXMNw=="+ },"lru-cache": {"version": "6.0.0","resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",@@ -2284,11 +2878,15 @@"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==","dev": true},+ "mimic-response": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="+ },"minimatch": {"version": "5.1.1","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz","integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",- "dev": true,"requires": {"brace-expansion": "^2.0.1"}@@ -2296,8 +2894,7 @@"minimist": {"version": "1.2.7","resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",- "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",- "dev": true+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="},"mitt": {"version": "3.0.0",@@ -2308,7 +2905,6 @@"version": "0.5.6","resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz","integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",- "dev": true,"requires": {"minimist": "^1.2.6"}@@ -2336,12 +2932,11 @@"ms": {"version": "2.1.2","resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",- "dev": true+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="},"muggle-string": {"version": "0.1.0",- "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.1.0.tgz",+ "resolved": "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.1.0.tgz","integrity": "sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==","dev": true},@@ -2405,8 +3000,7 @@"normalize-path": {"version": "3.0.0","resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",- "dev": true+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="},"npm-run-path": {"version": "4.0.1",@@ -2417,6 +3011,11 @@"path-key": "^3.0.0"}},+ "nzh": {+ "version": "1.0.11",+ "resolved": "https://registry.npmjs.org/nzh/-/nzh-1.0.11.tgz",+ "integrity": "sha512-Hmx1wuoj5zoFCEhfic4zW/2csg/vb5BxXAUGUNIyBlSu7ZtZezGVGloqNCnRcHVU1fMC9ZTfvbi6ayPWC1sRSQ=="+ },"object-inspect": {"version": "1.12.2","resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",@@ -2467,7 +3066,6 @@"version": "1.4.0","resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz","integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",- "dev": true,"requires": {"wrappy": "1"}@@ -2519,6 +3117,11 @@"p-limit": "^3.0.2"}},+ "pako": {+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="+ },"parent-module": {"version": "1.0.1","resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",@@ -2528,6 +3131,11 @@"callsites": "^3.0.0"}},+ "parenthesis": {+ "version": "3.1.8",+ "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz",+ "integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw=="+ },"parse-node-version": {"version": "1.0.1","resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",@@ -2543,8 +3151,7 @@"path-is-absolute": {"version": "1.0.1","resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",- "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",- "dev": true+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="},"path-key": {"version": "3.1.1",@@ -2570,6 +3177,11 @@"integrity": "sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==","dev": true},+ "performance-now": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz",+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="+ },"picocolors": {"version": "1.0.0","resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",@@ -2615,6 +3227,11 @@"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==","dev": true},+ "process-nextick-args": {+ "version": "2.0.1",+ "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="+ },"progress": {"version": "2.0.3","resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",@@ -2639,12 +3256,43 @@"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==","dev": true},+ "qrcode.vue": {+ "version": "3.4.0",+ "resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-3.4.0.tgz",+ "integrity": "sha512-4XeImbv10Fin16Fl2DArCMhGyAdvIg2jb7vDT+hZiIAMg/6H6mz9nUZr/dR8jBcun5VzNzkiwKhiqOGbloinwA=="+ },"queue-microtask": {"version": "1.2.3","resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz","integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==","dev": true},+ "raf": {+ "version": "3.4.1",+ "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",+ "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",+ "requires": {+ "performance-now": "^2.1.0"+ }+ },+ "readable-stream": {+ "version": "3.6.2",+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",+ "requires": {+ "inherits": "^2.0.3",+ "string_decoder": "^1.1.1",+ "util-deprecate": "^1.0.1"+ }+ },+ "readdir-glob": {+ "version": "1.1.3",+ "resolved": "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.3.tgz",+ "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",+ "requires": {+ "minimatch": "^5.1.0"+ }+ },"readdirp": {"version": "3.6.0","resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",@@ -2654,6 +3302,11 @@"picomatch": "^2.2.1"}},+ "regenerator-runtime": {+ "version": "0.13.11",+ "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",+ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="+ },"regexp.prototype.flags": {"version": "1.4.3","resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",@@ -2704,11 +3357,15 @@"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==","dev": true},+ "rgbcolor": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz",+ "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="+ },"rimraf": {"version": "2.6.3","resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz","integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",- "dev": true,"requires": {"glob": "^7.1.3"}@@ -2746,6 +3403,11 @@"tslib": "^1.9.0"}},+ "safe-buffer": {+ "version": "5.1.2",+ "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="+ },"safe-regex-test": {"version": "1.0.0","resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",@@ -2770,6 +3432,14 @@"dev": true,"optional": true},+ "saxes": {+ "version": "5.0.1",+ "resolved": "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz",+ "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",+ "requires": {+ "xmlchars": "^2.2.0"+ }+ },"scule": {"version": "1.0.0","resolved": "https://registry.npmmirror.com/scule/-/scule-1.0.0.tgz",@@ -2785,6 +3455,11 @@"lru-cache": "^6.0.0"}},+ "setimmediate": {+ "version": "1.0.5",+ "resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz",+ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="+ },"shebang-command": {"version": "2.0.0","resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",@@ -2817,6 +3492,21 @@"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==","dev": true},+ "simple-concat": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="+ },+ "simple-get": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",+ "requires": {+ "decompress-response": "^6.0.0",+ "once": "^1.3.1",+ "simple-concat": "^1.0.0"+ }+ },"slash": {"version": "3.0.0","resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",@@ -2842,6 +3532,26 @@}}},+ "socket.io-client": {+ "version": "4.7.2",+ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.2.tgz",+ "integrity": "sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==",+ "requires": {+ "@socket.io/component-emitter": "~3.1.0",+ "debug": "~4.3.2",+ "engine.io-client": "~6.5.2",+ "socket.io-parser": "~4.2.4"+ }+ },+ "socket.io-parser": {+ "version": "4.2.4",+ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",+ "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",+ "requires": {+ "@socket.io/component-emitter": "~3.1.0",+ "debug": "~4.3.1"+ }+ },"source-map": {"version": "0.6.1","resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",@@ -2863,6 +3573,27 @@"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==","dev": true},+ "ssf": {+ "version": "0.11.2",+ "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",+ "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",+ "requires": {+ "frac": "~1.1.2"+ }+ },+ "stackblur-canvas": {+ "version": "2.6.0",+ "resolved": "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.6.0.tgz",+ "integrity": "sha512-8S1aIA+UoF6erJYnglGPug6MaHYGo1Ot7h5fuXx4fUPvcvQfcdw2o/ppCse63+eZf8PPidSu4v1JnmEVtEDnpg=="+ },+ "string-split-by": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz",+ "integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==",+ "requires": {+ "parenthesis": "^3.1.5"+ }+ },"string-width": {"version": "4.2.3","resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",@@ -2896,6 +3627,14 @@"es-abstract": "^1.20.4"}},+ "string_decoder": {+ "version": "1.1.1",+ "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",+ "requires": {+ "safe-buffer": "~5.1.0"+ }+ },"strip-ansi": {"version": "6.0.1","resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",@@ -2955,6 +3694,11 @@"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==","dev": true},+ "svg-pathdata": {+ "version": "6.0.3",+ "resolved": "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz",+ "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="+ },"table": {"version": "5.4.6","resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",@@ -3007,6 +3751,26 @@}}},+ "tar-stream": {+ "version": "2.2.0",+ "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz",+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",+ "requires": {+ "bl": "^4.0.3",+ "end-of-stream": "^1.4.1",+ "fs-constants": "^1.0.0",+ "inherits": "^2.0.3",+ "readable-stream": "^3.1.1"+ }+ },+ "text-segmentation": {+ "version": "1.0.3",+ "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",+ "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",+ "requires": {+ "utrie": "^1.0.2"+ }+ },"text-table": {"version": "0.2.0","resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",@@ -3037,6 +3801,11 @@"is-number": "^7.0.0"}},+ "traverse": {+ "version": "0.3.9",+ "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.3.9.tgz",+ "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="+ },"ts-md5": {"version": "1.3.1","resolved": "https://registry.npmmirror.com/ts-md5/-/ts-md5-1.3.1.tgz",@@ -3085,9 +3854,9 @@"dev": true},"typescript": {- "version": "4.9.4",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",- "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",+ "version": "4.9.3",+ "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.9.3.tgz",+ "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==","dev": true},"ufo": {@@ -3233,6 +4002,39 @@}}},+ "unzipper": {+ "version": "0.10.14",+ "resolved": "https://registry.npmmirror.com/unzipper/-/unzipper-0.10.14.tgz",+ "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",+ "requires": {+ "big-integer": "^1.6.17",+ "binary": "~0.3.0",+ "bluebird": "~3.4.1",+ "buffer-indexof-polyfill": "~1.0.0",+ "duplexer2": "~0.1.4",+ "fstream": "^1.0.12",+ "graceful-fs": "^4.2.2",+ "listenercount": "~1.0.1",+ "readable-stream": "~2.3.6",+ "setimmediate": "~1.0.4"+ },+ "dependencies": {+ "readable-stream": {+ "version": "2.3.8",+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",+ "requires": {+ "core-util-is": "~1.0.0",+ "inherits": "~2.0.3",+ "isarray": "~1.0.0",+ "process-nextick-args": "~2.0.0",+ "safe-buffer": "~5.1.1",+ "string_decoder": "~1.1.1",+ "util-deprecate": "~1.0.1"+ }+ }+ }+ },"uri-js": {"version": "4.4.1","resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",@@ -3242,6 +4044,24 @@"punycode": "^2.1.0"}},+ "util-deprecate": {+ "version": "1.0.2",+ "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="+ },+ "utrie": {+ "version": "1.0.2",+ "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",+ "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",+ "requires": {+ "base64-arraybuffer": "^1.0.2"+ }+ },+ "uuid": {+ "version": "8.3.2",+ "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="+ },"v8-compile-cache": {"version": "2.3.0","resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",@@ -3334,6 +4154,31 @@"@vue/devtools-api": "^6.2.1"}},+ "vue-qr": {+ "version": "4.0.9",+ "resolved": "https://registry.npmjs.org/vue-qr/-/vue-qr-4.0.9.tgz",+ "integrity": "sha512-pAISV94T0MNEYA3NGjykUpsXRE2QfaNxlu9ZhEL6CERgqNc21hJYuP3hRVzAWfBQlgO18DPmZTbrFerJC3+Ikw==",+ "requires": {+ "glob": "^8.0.1",+ "js-binary-schema-parser": "^2.0.2",+ "simple-get": "^4.0.1",+ "string-split-by": "^1.0.0"+ },+ "dependencies": {+ "glob": {+ "version": "8.1.0",+ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",+ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",+ "requires": {+ "fs.realpath": "^1.0.0",+ "inflight": "^1.0.4",+ "inherits": "2",+ "minimatch": "^5.0.1",+ "once": "^1.3.0"+ }+ }+ }+ },"vue-router": {"version": "4.1.6","resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",@@ -3344,7 +4189,7 @@},"vue-template-compiler": {"version": "2.7.14",- "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",+ "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz","integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==","dev": true,"requires": {@@ -3353,19 +4198,27 @@}},"vue-tsc": {- "version": "1.0.12",- "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.0.12.tgz",- "integrity": "sha512-uWSASSHMfC61eEEOuLwf+eF9ODg0UzBV42/lIkZamxsA3PFZyV/eaq+RpEFP+NRXfL0GeXZUxY6l2dm9xlY07Q==",+ "version": "1.0.11",+ "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-1.0.11.tgz",+ "integrity": "sha512-lj+6dEroPsE4wmQOPtjCzAf8x363Km5/tuEvMEoQaoRnzs9myBM46FNvCGIIPStYUGuaqF1W1bORmP2KDQEORA==","dev": true,"requires": {- "@volar/vue-language-core": "1.0.12",- "@volar/vue-typescript": "1.0.12"+ "@volar/vue-language-core": "1.0.11",+ "@volar/vue-typescript": "1.0.11"+ }+ },+ "vue3-print-nb": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/vue3-print-nb/-/vue3-print-nb-0.1.4.tgz",+ "integrity": "sha512-LExI7viEzplR6ZKQ2b+V4U0cwGYbVD4fut/XHvk3UPGlT5CcvIGs6VlwGp107aKgk6P8Pgx4rco3Rehv2lti3A==",+ "requires": {+ "vue": "^3.0.5"}},"vuetify": {- "version": "3.1.0",- "resolved": "https://registry.npmmirror.com/vuetify/-/vuetify-3.1.0.tgz",- "integrity": "sha512-v0+5eNq4GPXGcJ0F2dwJDbQOhuZhEgoiUDWHXqgWJixzc9mzwt+4nSmPz0vYPYl9oC3UFf3Se+vh0xNoRjv4Ig=="+ "version": "3.3.12",+ "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.3.12.tgz",+ "integrity": "sha512-mH3CF+ALM1sC0Zm91IPq5b+bummrHH/Ek9jwYrQ0+fOAoJWd9nUcOIHODTPY+PODJDbJTwF6b3wVTDwqzUgTgQ=="},"vuex": {"version": "4.0.2",@@ -3396,6 +4249,11 @@"resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.3.7.tgz","integrity": "sha512-v+d7eEQ5uqtVTQCts4xkW0S15LZcIuEukYHGXI53SdoUj2gLFggPYAxQr1y659CM/ESRWPz9LNVHpd97KkjGHw=="},+ "vxe-table-plugin-export-xlsx": {+ "version": "3.0.4",+ "resolved": "https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.0.4.tgz",+ "integrity": "sha512-Og/NbXRIb+BS6sJ48oDNVrZnlkcpaCd/zS8JBAZjHLgioWr1Xoob6FEpaeXBebGPPgTumZNUrrBO57JhhYAerA=="+ },"webpack-sources": {"version": "3.2.3","resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",@@ -3430,6 +4288,16 @@"is-symbol": "^1.0.3"}},+ "wmf": {+ "version": "1.0.2",+ "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",+ "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="+ },+ "word": {+ "version": "0.3.0",+ "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",+ "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="+ },"word-wrap": {"version": "1.2.3","resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",@@ -3439,8 +4307,7 @@"wrappy": {"version": "1.0.2","resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",- "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",- "dev": true+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="},"write": {"version": "1.0.3",@@ -3451,22 +4318,76 @@"mkdirp": "^0.5.1"}},+ "ws": {+ "version": "8.11.0",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="+ },"xe-utils": {"version": "3.5.7","resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.7.tgz","integrity": "sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew=="},+ "xlsx": {+ "version": "0.18.5",+ "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",+ "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",+ "requires": {+ "adler-32": "~1.3.0",+ "cfb": "~1.2.1",+ "codepage": "~1.15.0",+ "crc-32": "~1.2.1",+ "ssf": "~0.11.2",+ "wmf": "~1.0.1",+ "word": "~0.3.0"+ }+ },+ "xmlchars": {+ "version": "2.2.0",+ "resolved": "https://registry.npmmirror.com/xmlchars/-/xmlchars-2.2.0.tgz",+ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="+ },+ "xmlhttprequest-ssl": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",+ "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="+ },"yallist": {"version": "4.0.0","resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz","integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==","dev": true},+ "yk-vue-plugin-hiprint": {+ "version": "0.0.2",+ "resolved": "https://registry.npmjs.org/yk-vue-plugin-hiprint/-/yk-vue-plugin-hiprint-0.0.2.tgz",+ "integrity": "sha512-wFB/lBWVUjzH71kihRzJbIyAzPxZ+1jdqvZMhEmV9dTH3Yx818zDc1AyxXf0YZNmukZU33yn+U63Ix+zGuvgJw==",+ "requires": {+ "@claviska/jquery-minicolors": "^2.3.6",+ "canvg": "^3.0.10",+ "html2canvas": "^1.4.1",+ "jquery": "^3.6.0",+ "jsbarcode": "^3.11.5",+ "jspdf": "^2.5.1",+ "nzh": "^1.0.8",+ "socket.io-client": "^4.5.1"+ }+ },"yocto-queue": {"version": "0.1.0","resolved": "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz","integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==","dev": true+ },+ "zip-stream": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",+ "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",+ "requires": {+ "archiver-utils": "^2.1.0",+ "compress-commons": "^4.1.0",+ "readable-stream": "^3.6.0"+ }}}}diff --git a/frontend/package.json b/frontend/package.jsonindex 7515b1f..bf1724c 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -9,25 +9,40 @@"preview": "vite preview"},"dependencies": {+ "@claviska/jquery-minicolors": "2.3.6","axios": "1.2.1",+ "canvg": "3.0.10",+ "echarts": "^5.4.3","exceljs": "4.3.0",+ "html2canvas": "1.4.1",+ "jquery": "3.7.0",+ "jsbarcode": "^3.11.5",+ "jspdf": "2.5.1",+ "lodash": "^4.17.21","lottie-web": "5.10.1","mitt": "3.0.0",+ "nzh": "1.0.9","qrcode.vue": "^3.3.3",+ "screenfull": "^6.0.2",+ "socket.io-client": "4.7.1","ts-md5": "1.3.1","vue": "3.2.45","vue-i18n": "9.2.2",+ "vue-qr": "^4.0.9","vue-router": "4.1.6",- "vuetify": "3.0.4",+ "vue3-print-nb": "^0.1.4",+ "vuetify": "3.3.12","vuex": "4.0.2","vuex-persist": "3.1.3","vxe-table": "4.3.7","vxe-table-plugin-export-xlsx": "3.0.4","xe-utils": "3.5.7",- "xlsx": "0.18.5"+ "xlsx": "0.18.5",+ "yk-vue-plugin-hiprint": "0.0.9"},"devDependencies": {"@mdi/font": "7.1.96",+ "@types/lodash": "^4.14.199","@types/node": "18.11.13","@typescript-eslint/eslint-plugin": "5.46.0","@typescript-eslint/parser": "5.46.0",diff --git a/frontend/public/bootstrap.min.css b/frontend/public/bootstrap.min.cssnew file mode 100644index 0000000..ed3905e--- /dev/null+++ b/frontend/public/bootstrap.min.css@@ -0,0 +1,6 @@+/*!+ * Bootstrap v3.3.7 (http://getbootstrap.com)+ * Copyright 2011-2016 Twitter, Inc.+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}+/*# sourceMappingURL=bootstrap.min.css.map */\ No newline at end of filediff --git a/frontend/public/favicon.ico b/frontend/public/favicon.iconew file mode 100644index 0000000..c7d3638Binary files /dev/null and b/frontend/public/favicon.ico differdiff --git a/frontend/public/print-lock.css b/frontend/public/print-lock.cssnew file mode 100644index 0000000..fdb6d7c--- /dev/null+++ b/frontend/public/print-lock.css@@ -0,0 +1,282 @@++@media print {+ body {+ margin: 0px;+ padding: 0px;+ }+}++@page {+ margin: 0;+}++.hiprint-printPaper * {+ box-sizing: border-box;+ -moz-box-sizing: border-box; /* Firefox */+ -webkit-box-sizing: border-box; /* Safari */+ image-rendering: -webkit-optimize-contrast; /* 让图片/标尺稍微清楚一点 */+}++ .hiprint-printPaper *:focus {+ outline: -webkit-focus-ring-color auto 0px;+ }+++.hiprint-page-break-avoid {+ page-break-after: avoid;+}+.hiprint-printPaper {+ position: relative;+ padding: 0 0 0 0;+ page-break-after: always;+ -webkit-user-select: none; /* Chrome/Safari/Opera */+ -moz-user-select: none; /* Firefox */+ user-select: none;+ overflow-x: hidden;+ overflow: hidden;+}+ .hiprint-printPaper .hiprint-printPaper-content {+ position: relative;+ }+.hiprint-printPaper.design {+ overflow: visible;+}++++.hiprint-printTemplate .hiprint-printPanel {+ page-break-after: always;+}++.hiprint-printPaper, hiprint-printPanel {+ box-sizing: border-box;+ border: 0px;+}++.hiprint-printPanel .hiprint-printPaper:last-child {+ page-break-after: avoid;+}++.hiprint-printTemplate .hiprint-printPanel:last-child {+ page-break-after: avoid;+}++.hiprint-printPaper .hideheaderLinetarget {+ border-top: 0px dashed rgb(201, 190, 190) !important;+}++.hiprint-printPaper .hidefooterLinetarget {+ border-top: 0px dashed rgb(201, 190, 190) !important;+}++.hiprint-printPaper.design {+ border: 1px dashed rgba(170,170,170,0.7);+}++.design .hiprint-printElement-table-content, .design .hiprint-printElement-longText-content {+ overflow: hidden;+ box-sizing: border-box;+}++.design .resize-panel {+ box-sizing: border-box;+ border: 1px dotted;+}++.hiprint-printElement-text {+ background-color: transparent;+ background-repeat: repeat;+ padding: 0 0 0 0;+ border: 0.75pt none rgb(0,0,0);+ direction: ltr;+ font-family: 'SimSun';+ font-size: 9pt;+ font-style: normal;+ font-weight: normal;+ padding-bottom: 0pt;+ padding-left: 0pt;+ padding-right: 0pt;+ padding-top: 0pt;+ text-align: left;+ text-decoration: none;+ line-height: 9.75pt;+ box-sizing: border-box;+ word-wrap: break-word;+ word-break: break-all;+}++.design .hiprint-printElement-text-content {+ border: 1px dashed rgb(206, 188, 188);+ box-sizing: border-box;+}++.hiprint-printElement-longText {+ background-color: transparent;+ background-repeat: repeat;+ border: 0.75pt none rgb(0,0,0);+ direction: ltr;+ font-family: 'SimSun';+ font-size: 9pt;+ font-style: normal;+ font-weight: normal;+ padding-bottom: 0pt;+ padding-left: 0pt;+ padding-right: 0pt;+ padding-top: 0pt;+ text-align: left;+ text-decoration: none;+ line-height: 9.75pt;+ box-sizing: border-box;+ word-wrap: break-word;+ word-break: break-all;+ /*white-space: pre-wrap*/+}++++.hiprint-printElement-table {+ background-color: transparent;+ background-repeat: repeat;+ color: rgb(0,0,0);+ border-color: rgb(0,0,0);+ border-style: none;+ direction: ltr;+ font-family: 'SimSun';+ font-size: 9pt;+ font-style: normal;+ font-weight: normal;+ padding-bottom: 0pt;+ padding-left: 0pt;+ padding-right: 0pt;+ padding-top: 0pt;+ text-align: left;+ text-decoration: none;+ padding: 0 0 0 0;+ box-sizing: border-box;+ line-height: 9.75pt;+}++ .hiprint-printElement-table thead {+ background: #e8e8e8;+ font-weight: 700;+ }++.hiprint-printElement-tableTarget, .hiprint-printElement-tableTarget tr, .hiprint-printElement-tableTarget td {+ border-color: rgb(0,0,0);+ border-style: none;+ border: 1px solid rgb(0,0,0);+ font-weight: normal;+ direction: ltr;+ padding-bottom: 0pt;+ padding-left: 4pt;+ padding-right: 4pt;+ padding-top: 0pt;+ text-decoration: none;+ vertical-align: middle;+ box-sizing: border-box;+ word-wrap: break-word;+ word-break: break-all;+ /*line-height: 9.75pt;+ font-size: 9pt;*/+}++ /*.hiprint-printElement-tableTarget tr,*/+ .hiprint-printElement-tableTarget td {+ height: 18pt;+ }++.hiprint-printPaper .hiprint-paperNumber {+ font-size: 9pt;+}++.design .hiprint-printElement-table-handle {+ position: absolute;+ height: 21pt;+ width: 21pt;+ background: red;+ z-index:1;+}++.hiprint-printPaper .hiprint-paperNumber-disabled {+ float: right !important;+ right: 0 !important;+ color: gainsboro !important;+}++.hiprint-printElement-vline, .hiprint-printElement-hline {+ border: 0px none rgb(0,0,0);++}+.hiprint-printElement-vline {+ border-left: 0.75pt solid #000;+ border-right: 0px none rgb(0,0,0) !important;+ border-bottom: 0px none rgb(0,0,0) !important;+ border-top: 0px none rgb(0,0,0) !important;+}++.hiprint-printElement-hline {+ border-top: 0.75pt solid #000;+ border-right: 0px none rgb(0,0,0) !important;+ border-bottom: 0px none rgb(0,0,0) !important;+ border-left: 0px none rgb(0,0,0) !important;+}++.hiprint-printElement-oval, .hiprint-printElement-rect {+ border: 0.75pt solid #000;+}++.hiprint-text-content-middle {+ display:table;+}+.hiprint-text-content-middle>div {+ display: table-cell;+ vertical-align:middle+}++.hiprint-text-content-bottom {+ display: table;+}++ .hiprint-text-content-bottom > div {+ display: table-cell;+ vertical-align: bottom+ }++/*hi-grid-row */+.hi-grid-row {+ position: relative;+ height: auto;+ margin-right: 0;+ margin-left: 0;+ zoom: 1;+ display: block;+ box-sizing: border-box;+}++ .hi-grid-row::after, .hi-grid-row::before {+ display: table;+ content: '';+ box-sizing: border-box;+ }++.hi-grid-col {+ display: block;+ box-sizing: border-box;+ position: relative;+ float: left;+ flex: 0 0 auto;+}++.table-grid-row {+ margin-left: -0pt;+ margin-right: -0pt;+}++.tableGridColumnsGutterRow {+ padding-left: 0pt;+ padding-right: 0pt;+}+.hiprint-gridColumnsFooter {+ text-align: left;+ clear: both;+}diff --git a/frontend/public/unity/Build/wms.data.unityweb b/frontend/public/unity/Build/wms.data.unitywebnew file mode 100644index 0000000..127b481Binary files /dev/null and b/frontend/public/unity/Build/wms.data.unityweb differdiff --git a/frontend/public/unity/Build/wms.framework.js.unityweb b/frontend/public/unity/Build/wms.framework.js.unitywebnew file mode 100644index 0000000..65c996eBinary files /dev/null and b/frontend/public/unity/Build/wms.framework.js.unityweb differdiff --git a/frontend/public/unity/Build/wms.loader.js b/frontend/public/unity/Build/wms.loader.jsnew file mode 100644index 0000000..1431a02--- /dev/null+++ b/frontend/public/unity/Build/wms.loader.js@@ -0,0 +1 @@+function createUnityInstance(t,n,l){function d(e,t){if(!d.aborted&&n.showBanner)return"error"==t&&(d.aborted=!0),n.showBanner(e,t);switch(t){case"error":console.error(e);break;case"warning":console.warn(e);break;default:console.log(e)}}function r(e){var t=e.reason||e.error,n=t?t.toString():e.message||e.reason||"",r=t&&t.stack?t.stack.toString():"";(n+="\n"+(r=r.startsWith(n)?r.substring(n.length):r).trim())&&c.stackTraceRegExp&&c.stackTraceRegExp.test(n)&&k(n,e.filename||t&&(t.fileName||t.sourceURL)||"",e.lineno||t&&(t.lineNumber||t.line)||0)}function e(e,t,n){var r=e[t];void 0!==r&&r||(console.warn('Config option "'+t+'" is missing or empty. Falling back to default value: "'+n+'". Consider updating your WebGL template to include the missing config option.'),e[t]=n)}l=l||function(){};var o,c={canvas:t,webglContextAttributes:{preserveDrawingBuffer:!1,powerPreference:2},cacheControl:function(e){return e==c.dataUrl?"must-revalidate":"no-store"},streamingAssetsUrl:"StreamingAssets",downloadProgress:{},deinitializers:[],intervals:{},setInterval:function(e,t){e=window.setInterval(e,t);return this.intervals[e]=!0,e},clearInterval:function(e){delete this.intervals[e],window.clearInterval(e)},preRun:[],postRun:[],print:function(e){console.log(e)},printErr:function(e){console.error(e),"string"==typeof e&&-1!=e.indexOf("wasm streaming compile failed")&&(-1!=e.toLowerCase().indexOf("mime")?d('HTTP Response Header "Content-Type" configured incorrectly on the server for file '+c.codeUrl+' , should be "application/wasm". Startup time performance will suffer.',"warning"):d('WebAssembly streaming compilation failed! This can happen for example if "Content-Encoding" HTTP header is incorrectly enabled on the server for file '+c.codeUrl+", but the file is not pre-compressed on disk (or vice versa). Check the Network tab in browser Devtools to debug server header configuration.","warning"))},locateFile:function(e){return e},disabledCanvasEvents:["contextmenu","dragstart"]};for(o in e(n,"companyName","Unity"),e(n,"productName","WebGL Player"),e(n,"productVersion","1.0"),n)c[o]=n[o];c.streamingAssetsUrl=new URL(c.streamingAssetsUrl,document.URL).href;var a=c.disabledCanvasEvents.slice();function i(e){e.preventDefault()}a.forEach(function(e){t.addEventListener(e,i)}),window.addEventListener("error",r),window.addEventListener("unhandledrejection",r),c.deinitializers.push(function(){for(var e in c.disableAccessToMediaDevices(),a.forEach(function(e){t.removeEventListener(e,i)}),window.removeEventListener("error",r),window.removeEventListener("unhandledrejection",r),c.intervals)window.clearInterval(e);c.intervals={}}),c.QuitCleanup=function(){for(var e=0;e<c.deinitializers.length;e++)c.deinitializers[e]();c.deinitializers=[],"function"==typeof c.onQuit&&c.onQuit()};var s,u,f,h,b,m,g,p,w="",v="",y=(document.addEventListener("webkitfullscreenchange",function(e){document.webkitCurrentFullScreenElement===t?t.style.width&&(w=t.style.width,v=t.style.height,t.style.width="100%",t.style.height="100%"):w&&(t.style.width=w,t.style.height=v,v=w="")}),{Module:c,SetFullscreen:function(){if(c.SetFullscreen)return c.SetFullscreen.apply(c,arguments);c.print("Failed to set Fullscreen mode: Player not loaded yet.")},SendMessage:function(){if(c.SendMessage)return c.SendMessage.apply(c,arguments);c.print("Failed to execute SendMessage: Player not loaded yet.")},Quit:function(){return new Promise(function(e,t){c.shouldQuit=!0,c.onQuit=e})}});function k(e,t,n){-1==e.indexOf("fullscreen error")&&(c.startupErrorHandler?c.startupErrorHandler(e,t,n):c.errorHandler&&c.errorHandler(e,t,n)||(console.log("Invoking error handler due to\n"+e),"function"==typeof dump&&dump("Invoking error handler due to\n"+e),k.didShowErrorMessage||(-1!=(e="An error occurred running the Unity content on this page. See your browser JavaScript console for more info. The error was:\n"+e).indexOf("DISABLE_EXCEPTION_CATCHING")?e="An exception has occurred, but exception handling has been disabled in this build. If you are the developer of this content, enable exceptions in your project WebGL player settings to be able to catch the exception or see the stack trace.":-1!=e.indexOf("Cannot enlarge memory arrays")?e="Out of memory. If you are the developer of this content, try allocating more memory to your WebGL build in the WebGL player settings.":-1==e.indexOf("Invalid array buffer length")&&-1==e.indexOf("Invalid typed array length")&&-1==e.indexOf("out of memory")&&-1==e.indexOf("could not allocate memory")||(e="The browser could not allocate enough memory for the WebGL content. If you are the developer of this content, try allocating less memory to your WebGL build in the WebGL player settings."),alert(e),k.didShowErrorMessage=!0)))}function x(e,t){if("symbolsUrl"!=e){var n=c.downloadProgress[e],r=(n=n||(c.downloadProgress[e]={started:!1,finished:!1,lengthComputable:!1,total:0,loaded:0}),"object"!=typeof t||"progress"!=t.type&&"load"!=t.type||(n.started||(n.started=!0,n.lengthComputable=t.lengthComputable),n.total=t.total,n.loaded=t.loaded,"load"==t.type&&(n.finished=!0)),0),o=0,a=0,i=0,s=0;for(e in c.downloadProgress){if(!(n=c.downloadProgress[e]).started)return;a++,n.lengthComputable?(r+=n.loaded,o+=n.total,i++):n.finished||s++}l(.9*(a?(a-s-(o?i*(o-r)/o:0))/a:0))}}function _(){var o=this;o.isConnected=new Promise(function(t,n){try{function r(){o.openDBTimeout&&(clearTimeout(o.openDBTimeout),o.openDBTimeout=null)}o.openDBTimeout=setTimeout(function(){void 0===o.database&&n(new Error("Could not connect to database: Timeout."))},2e3);var e=h.open(s.name,s.version);e.onupgradeneeded=function(e){var t;(e=(e=e).target.result).objectStoreNames.contains(f.name)||e.createObjectStore(f.name),e.objectStoreNames.contains(u.name)||(t=e.createObjectStore(u.name,{keyPath:"url"}),["version","company","product","updated","revalidated","accessed"].forEach(function(e){t.createIndex(e,e)}))},e.onsuccess=function(e){r(),o.database=e.target.result,t()},e.onerror=function(e){r(),o.database=null,n(new Error("Could not connect to database."))}}catch(e){r(),o.database=null,n(new Error("Could not connect to database."))}})}function S(e){console.log("[UnityCache] "+e)}function E(e){return E.link=E.link||document.createElement("a"),E.link.href=e,E.link.href}function C(t){t=t||{},this.headers=new Headers,Object.keys(t.headers).forEach(function(e){this.headers.set(e,t.headers[e])}.bind(this)),this.redirected=t.redirected,this.status=t.status,this.statusText=t.statusText,this.type=t.type,this.url=t.url,this.parsedBody=t.parsedBody,Object.defineProperty(this,"ok",{get:function(){return 200<=this.status&&this.status<=299}.bind(this)})}function B(e,t,n,r,o){var a={url:e,version:g.version,company:t,product:n,updated:r,revalidated:r,accessed:r,response:{headers:{}}};return o&&(o.headers.forEach(function(e,t){a.response.headers[t]=e}),["redirected","status","statusText","type","url"].forEach(function(e){a.response[e]=o[e]}),a.response.parsedBody=o.parsedBody),a}c.SystemInfo=function(){var e,t,n,r,o=navigator.userAgent+" ",a=[["Firefox","Firefox"],["OPR","Opera"],["Edg","Edge"],["SamsungBrowser","Samsung Browser"],["Trident","Internet Explorer"],["MSIE","Internet Explorer"],["Chrome","Chrome"],["CriOS","Chrome on iOS Safari"],["FxiOS","Firefox on iOS Safari"],["Safari","Safari"]];function i(e,t,n){return(e=RegExp(e,"i").exec(t))&&e[n]}for(var s=0;s<a.length;++s)if(t=i(a[s][0]+"[/ ](.*?)[ \\)]",o,1)){e=a[s][1];break}"Safari"==e&&(t=i("Version/(.*?) ",o,1)),"Internet Explorer"==e&&(t=i("rv:(.*?)\\)? ",o,1)||t);for(var l=[["Windows (.*?)[;)]","Windows"],["Android ([0-9_.]+)","Android"],["iPhone OS ([0-9_.]+)","iPhoneOS"],["iPad.*? OS ([0-9_.]+)","iPadOS"],["FreeBSD( )","FreeBSD"],["OpenBSD( )","OpenBSD"],["Linux|X11()","Linux"],["Mac OS X ([0-9_\\.]+)","MacOS"],["bot|google|baidu|bing|msn|teoma|slurp|yandex","Search Bot"]],d=0;d<l.length;++d)if(u=i(l[d][0],o,1)){n=l[d][1],u=u.replace(/_/g,".");break}var u={"NT 5.0":"2000","NT 5.1":"XP","NT 5.2":"Server 2003","NT 6.0":"Vista","NT 6.1":"7","NT 6.2":"8","NT 6.3":"8.1","NT 10.0":"10"}[u]||u,c=((c=document.createElement("canvas"))&&(gl=c.getContext("webgl2"),glVersion=gl?2:0,gl||(gl=c&&c.getContext("webgl"))&&(glVersion=1),gl&&(r=gl.getExtension("WEBGL_debug_renderer_info")&&gl.getParameter(37446)||gl.getParameter(7937))),"undefined"!=typeof SharedArrayBuffer),f="object"==typeof WebAssembly&&"function"==typeof WebAssembly.compile;return{width:screen.width,height:screen.height,userAgent:o.trim(),browser:e||"Unknown browser",browserVersion:t||"Unknown version",mobile:/Mobile|Android|iP(ad|hone)/.test(navigator.appVersion),os:n||"Unknown OS",osVersion:u||"Unknown OS Version",gpu:r||"Unknown GPU",language:navigator.userLanguage||navigator.language,hasWebGL:glVersion,hasCursorLock:!!document.body.requestPointerLock,hasFullscreen:!!document.body.requestFullscreen||!!document.body.webkitRequestFullscreen,hasThreads:c,hasWasm:f,hasWasmThreads:!1}}(),c.abortHandler=function(e){return k(e,"",0),!0},Error.stackTraceLimit=Math.max(Error.stackTraceLimit||0,50),c.readBodyWithProgress=function(a,i,s){var e=a.body?a.body.getReader():void 0,l=void 0!==a.headers.get("Content-Length"),d=function(e,t){if(!t)return 0;var t=e.headers.get("Content-Encoding"),n=parseInt(e.headers.get("Content-Length"));switch(t){case"br":return Math.round(5*n);case"gzip":return Math.round(4*n);default:return n}}(a,l),u=new Uint8Array(d),c=[],f=0,h=0;return l||console.warn("[UnityCache] Response is served without Content-Length header. Please reconfigure server to include valid Content-Length for better download performance."),function o(){return void 0===e?a.arrayBuffer().then(function(e){var t=new Uint8Array(e);return i({type:"progress",response:a,total:e.length,loaded:0,lengthComputable:l,chunk:s?t:null}),t}):e.read().then(function(e){if(e.done){if(f===d)return u;if(f<d)return u.slice(0,f);for(var t=new Uint8Array(f),n=(t.set(u,0),h),r=0;r<c.length;++r)t.set(c[r],n),n+=c[r].length;return t}return f+e.value.length<=u.length?(u.set(e.value,f),h=f+e.value.length):c.push(e.value),f+=e.value.length,i({type:"progress",response:a,total:Math.max(d,f),loaded:f,lengthComputable:l,chunk:s?e.value:null}),o()})}().then(function(e){return i({type:"load",response:a,total:e.length,loaded:e.length,lengthComputable:l,chunk:null}),a.parsedBody=e,a})},c.fetchWithProgress=function(e,t){var n=function(){};return t&&t.onProgress&&(n=t.onProgress),fetch(e,t).then(function(e){return c.readBodyWithProgress(e,n,t.enableStreamingDownload)})},c.UnityCache=(s={name:"UnityCache",version:3},u={name:"RequestStore",version:1},f={name:"WebAssembly",version:1},h=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB,_.UnityCacheDatabase=s,_.RequestStore=u,_.WebAssemblyStore=f,b=null,_.getInstance=function(){return b=b||new _},_.destroyInstance=function(){return b?b.close().then(function(){b=null}):Promise.resolve()},_.clearCache=function(){return _.destroyInstance().then(function(){return new Promise(function(e,t){var n=h.deleteDatabase(s.name);n.onsuccess=function(){e()},n.onerror=function(){t(new Error("Could not delete database."))},n.onblocked=function(){t(new Error("Database blocked."))}})})},_.prototype.execute=function(a,i,s){return this.isConnected.then(function(){return new Promise(function(t,n){try{var e,r,o;null===this.database?n(new Error("indexedDB access denied")):(e=-1!=["put","delete","clear"].indexOf(i)?"readwrite":"readonly",r=this.database.transaction([a],e).objectStore(a),"openKeyCursor"==i&&(r=r.index(s[0]),s=s.slice(1)),(o=r[i].apply(r,s)).onsuccess=function(e){t(e.target.result)},o.onerror=function(e){n(e)})}catch(e){n(e)}}.bind(this))}.bind(this))},_.prototype.loadRequest=function(e){return this.execute(u.name,"get",[e])},_.prototype.storeRequest=function(e){return this.execute(u.name,"put",[e])},_.prototype.close=function(){return this.isConnected.then(function(){this.database&&(this.database.close(),this.database=null)}.bind(this))},_),c.cachedFetch=(m=c.UnityCache,g=m.RequestStore,p=c.fetchWithProgress,C.prototype.arrayBuffer=function(){return Promise.resolve(this.parsedBody.buffer)},C.prototype.blob=function(){return this.arrayBuffer().then(function(e){return new Blob([e])})},C.prototype.json=function(){return this.text().then(function(e){return JSON.parse(e)})},C.prototype.text=function(){var e=new TextDecoder;return Promise.resolve(e.decode(this.parsedBody))},function(r,o){var e,t,a=m.getInstance(),n=E("string"==typeof r?r:r.url),i={enabled:(e=n,(!(t=o)||!t.method||"GET"===t.method)&&((!t||-1!=["must-revalidate","immutable"].indexOf(t.control))&&!!e.match("^https?://")))};function s(e,t){return p(e,t).then(function(e){if(i.enabled&&!i.revalidated){if(304===e.status)return i.result.revalidated=i.result.accessed,i.revalidated=!0,a.storeRequest(i.result).then(function(){S("'"+i.result.url+"' successfully revalidated and served from the indexedDB cache")}).catch(function(e){S("'"+i.result.url+"' successfully revalidated but not stored in the indexedDB cache due to the error: "+e)}),new C(i.result.response);200==e.status?(i.result=B(e.url,i.company,i.product,i.accessed,e),i.revalidated=!0,a.storeRequest(i.result).then(function(){S("'"+i.result.url+"' successfully downloaded and stored in the indexedDB cache")}).catch(function(e){S("'"+i.result.url+"' successfully downloaded but not stored in the indexedDB cache due to the error: "+e)})):S("'"+i.result.url+"' request failed with status: "+e.status+" "+e.statusText)}return e})}function l(e){o&&o.onProgress&&(o.onProgress({type:"progress",total:e.parsedBody.length,loaded:e.parsedBody.length,lengthComputable:!0}),o.onProgress({type:"load",total:e.parsedBody.length,loaded:e.parsedBody.length,lengthComputable:!0}))}return o&&(i.control=o.control,i.company=o.company,i.product=o.product),i.result=B(n,i.company,i.product,Date.now()),i.revalidated=!1,i.enabled?a.loadRequest(i.result.url).then(function(e){if(!e||e.version!==g.version)return s(r,o);i.result=e,i.result.accessed=Date.now();var t,n=new C(i.result.response);return"immutable"==i.control?(i.revalidated=!0,a.storeRequest(i.result),S("'"+i.result.url+"' served from the indexedDB cache without revalidation"),l(n),n):(e=i.result.url,(t=window.location.href.match(/^[a-z]+:\/\/[^\/]+/))&&!e.lastIndexOf(t[0],0)||!n.headers.get("Last-Modified")&&!n.headers.get("ETag")?(e=(o=o||{}).headers||{},o.headers=e,n.headers.get("Last-Modified")?(e["If-Modified-Since"]=n.headers.get("Last-Modified"),e["Cache-Control"]="no-cache"):n.headers.get("ETag")&&(e["If-None-Match"]=n.headers.get("ETag"),e["Cache-Control"]="no-cache"),s(r,o)):fetch(i.result.url,{method:"HEAD"}).then(function(t){return i.revalidated=["Last-Modified","ETag"].every(function(e){return!n.headers.get(e)||n.headers.get(e)==t.headers.get(e)}),i.revalidated?(i.result.revalidated=i.result.accessed,a.storeRequest(i.result),S("'"+i.result.url+"' successfully revalidated and served from the indexedDB cache"),l(n),n):s(r,o)}))}).catch(function(e){return S("Failed to load '"+i.result.url+"' from indexedDB cache due to the error: "+e),p(r,o)}):p(r,o)});var U={gzip:{require:function(e){var t,n={"inflate.js":function(e,t,n){"use strict";var c=e("./zlib/inflate"),f=e("./utils/common"),h=e("./utils/strings"),b=e("./zlib/constants"),r=e("./zlib/messages"),o=e("./zlib/zstream"),a=e("./zlib/gzheader"),m=Object.prototype.toString;function i(e){if(!(this instanceof i))return new i(e);this.options=f.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;if(t.raw&&0<=t.windowBits&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(0<=t.windowBits&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),15<t.windowBits&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new o,this.strm.avail_out=0,(e=c.inflateInit2(this.strm,t.windowBits))!==b.Z_OK)throw new Error(r[e]);this.header=new a,c.inflateGetHeader(this.strm,this.header)}function s(e,t){if((t=new i(t)).push(e,!0),t.err)throw t.msg||r[t.err];return t.result}i.prototype.push=function(e,t){var n,r,o,a,i,s=this.strm,l=this.options.chunkSize,d=this.options.dictionary,u=!1;if(this.ended)return!1;r=t===~~t?t:!0===t?b.Z_FINISH:b.Z_NO_FLUSH,"string"==typeof e?s.input=h.binstring2buf(e):"[object ArrayBuffer]"===m.call(e)?s.input=new Uint8Array(e):s.input=e,s.next_in=0,s.avail_in=s.input.length;do{if(0===s.avail_out&&(s.output=new f.Buf8(l),s.next_out=0,s.avail_out=l),(n=c.inflate(s,b.Z_NO_FLUSH))===b.Z_NEED_DICT&&d&&(i="string"==typeof d?h.string2buf(d):"[object ArrayBuffer]"===m.call(d)?new Uint8Array(d):d,n=c.inflateSetDictionary(this.strm,i)),n===b.Z_BUF_ERROR&&!0===u&&(n=b.Z_OK,u=!1),n!==b.Z_STREAM_END&&n!==b.Z_OK)return this.onEnd(n),!(this.ended=!0)}while(!s.next_out||0!==s.avail_out&&n!==b.Z_STREAM_END&&(0!==s.avail_in||r!==b.Z_FINISH&&r!==b.Z_SYNC_FLUSH)||("string"===this.options.to?(i=h.utf8border(s.output,s.next_out),o=s.next_out-i,a=h.buf2string(s.output,i),s.next_out=o,s.avail_out=l-o,o&&f.arraySet(s.output,s.output,i,o,0),this.onData(a)):this.onData(f.shrinkBuf(s.output,s.next_out))),0===s.avail_in&&0===s.avail_out&&(u=!0),(0<s.avail_in||0===s.avail_out)&&n!==b.Z_STREAM_END);return(r=n===b.Z_STREAM_END?b.Z_FINISH:r)===b.Z_FINISH?(n=c.inflateEnd(this.strm),this.onEnd(n),this.ended=!0,n===b.Z_OK):r!==b.Z_SYNC_FLUSH||(this.onEnd(b.Z_OK),!(s.avail_out=0))},i.prototype.onData=function(e){this.chunks.push(e)},i.prototype.onEnd=function(e){e===b.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=f.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},n.Inflate=i,n.inflate=s,n.inflateRaw=function(e,t){return(t=t||{}).raw=!0,s(e,t)},n.ungzip=s},"utils/common.js":function(e,t,n){"use strict";var r="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array,o=(n.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var n=t.shift();if(n){if("object"!=typeof n)throw new TypeError(n+"must be non-object");for(var r in n)n.hasOwnProperty(r)&&(e[r]=n[r])}}return e},n.shrinkBuf=function(e,t){if(e.length!==t){if(e.subarray)return e.subarray(0,t);e.length=t}return e},{arraySet:function(e,t,n,r,o){if(t.subarray&&e.subarray)e.set(t.subarray(n,n+r),o);else for(var a=0;a<r;a++)e[o+a]=t[n+a]},flattenChunks:function(e){for(var t,n,r,o=0,a=0,i=e.length;a<i;a++)o+=e[a].length;for(r=new Uint8Array(o),a=t=0,i=e.length;a<i;a++)n=e[a],r.set(n,t),t+=n.length;return r}}),a={arraySet:function(e,t,n,r,o){for(var a=0;a<r;a++)e[o+a]=t[n+a]},flattenChunks:function(e){return[].concat.apply([],e)}};n.setTyped=function(e){e?(n.Buf8=Uint8Array,n.Buf16=Uint16Array,n.Buf32=Int32Array,n.assign(n,o)):(n.Buf8=Array,n.Buf16=Array,n.Buf32=Array,n.assign(n,a))},n.setTyped(r)},"utils/strings.js":function(e,t,n){"use strict";var l=e("./common"),o=!0,a=!0;try{String.fromCharCode.apply(null,[0])}catch(e){o=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){a=!1}for(var d=new l.Buf8(256),r=0;r<256;r++)d[r]=252<=r?6:248<=r?5:240<=r?4:224<=r?3:192<=r?2:1;function u(e,t){if(t<65537&&(e.subarray&&a||!e.subarray&&o))return String.fromCharCode.apply(null,l.shrinkBuf(e,t));for(var n="",r=0;r<t;r++)n+=String.fromCharCode(e[r]);return n}d[254]=d[254]=1,n.string2buf=function(e){for(var t,n,r,o,a=e.length,i=0,s=0;s<a;s++)55296==(64512&(n=e.charCodeAt(s)))&&s+1<a&&56320==(64512&(r=e.charCodeAt(s+1)))&&(n=65536+(n-55296<<10)+(r-56320),s++),i+=n<128?1:n<2048?2:n<65536?3:4;for(t=new l.Buf8(i),s=o=0;o<i;s++)55296==(64512&(n=e.charCodeAt(s)))&&s+1<a&&56320==(64512&(r=e.charCodeAt(s+1)))&&(n=65536+(n-55296<<10)+(r-56320),s++),n<128?t[o++]=n:(n<2048?t[o++]=192|n>>>6:(n<65536?t[o++]=224|n>>>12:(t[o++]=240|n>>>18,t[o++]=128|n>>>12&63),t[o++]=128|n>>>6&63),t[o++]=128|63&n);return t},n.buf2binstring=function(e){return u(e,e.length)},n.binstring2buf=function(e){for(var t=new l.Buf8(e.length),n=0,r=t.length;n<r;n++)t[n]=e.charCodeAt(n);return t},n.buf2string=function(e,t){for(var n,r,o=t||e.length,a=new Array(2*o),i=0,s=0;s<o;)if((n=e[s++])<128)a[i++]=n;else if(4<(r=d[n]))a[i++]=65533,s+=r-1;else{for(n&=2===r?31:3===r?15:7;1<r&&s<o;)n=n<<6|63&e[s++],r--;1<r?a[i++]=65533:n<65536?a[i++]=n:(n-=65536,a[i++]=55296|n>>10&1023,a[i++]=56320|1023&n)}return u(a,i)},n.utf8border=function(e,t){for(var n=(t=(t=t||e.length)>e.length?e.length:t)-1;0<=n&&128==(192&e[n]);)n--;return!(n<0)&&0!==n&&n+d[e[n]]>t?n:t}},"zlib/inflate.js":function(e,t,n){"use strict";var L=e("../utils/common"),O=e("./adler32"),I=e("./crc32"),A=e("./inffast"),P=e("./inftrees"),D=0,N=-2,z=1,r=852,o=592;function F(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function a(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new L.Buf16(320),this.work=new L.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function i(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=z,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new L.Buf32(r),t.distcode=t.distdyn=new L.Buf32(o),t.sane=1,t.back=-1,D):N}function s(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,i(e)):N}function l(e,t){var n,r;return!e||!e.state||(r=e.state,t<0?(n=0,t=-t):(n=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15<t))?N:(null!==r.window&&r.wbits!==t&&(r.window=null),r.wrap=n,r.wbits=t,s(e))}function d(e,t){var n;return e?(n=new a,(e.state=n).window=null,(n=l(e,t))!==D&&(e.state=null),n):N}var Z,j,H=!0;function W(e,t,n,r){var o;return null===(e=e.state).window&&(e.wsize=1<<e.wbits,e.wnext=0,e.whave=0,e.window=new L.Buf8(e.wsize)),r>=e.wsize?(L.arraySet(e.window,t,n-e.wsize,e.wsize,0),e.wnext=0,e.whave=e.wsize):(r<(o=e.wsize-e.wnext)&&(o=r),L.arraySet(e.window,t,n-r,o,e.wnext),(r-=o)?(L.arraySet(e.window,t,n-r,r,0),e.wnext=r,e.whave=e.wsize):(e.wnext+=o,e.wnext===e.wsize&&(e.wnext=0),e.whave<e.wsize&&(e.whave+=o))),0}n.inflateReset=s,n.inflateReset2=l,n.inflateResetKeep=i,n.inflateInit=function(e){return d(e,15)},n.inflateInit2=d,n.inflate=function(e,t){var n,r,o,a,i,s,l,d,u,c,f,h,b,m,g,p,w,v,y,k,x,_,S,E,C=0,B=new L.Buf8(4),U=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return N;12===(n=e.state).mode&&(n.mode=13),i=e.next_out,o=e.output,l=e.avail_out,a=e.next_in,r=e.input,s=e.avail_in,d=n.hold,u=n.bits,c=s,f=l,_=D;e:for(;;)switch(n.mode){case z:if(0===n.wrap)n.mode=13;else{for(;u<16;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(2&n.wrap&&35615===d)B[n.check=0]=255&d,B[1]=d>>>8&255,n.check=I(n.check,B,2,0),u=d=0,n.mode=2;else if(n.flags=0,n.head&&(n.head.done=!1),!(1&n.wrap)||(((255&d)<<8)+(d>>8))%31)e.msg="incorrect header check",n.mode=30;else if(8!=(15&d))e.msg="unknown compression method",n.mode=30;else{if(u-=4,x=8+(15&(d>>>=4)),0===n.wbits)n.wbits=x;else if(x>n.wbits){e.msg="invalid window size",n.mode=30;break}n.dmax=1<<x,e.adler=n.check=1,n.mode=512&d?10:12,u=d=0}}break;case 2:for(;u<16;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(n.flags=d,8!=(255&n.flags)){e.msg="unknown compression method",n.mode=30;break}if(57344&n.flags){e.msg="unknown header flags set",n.mode=30;break}n.head&&(n.head.text=d>>8&1),512&n.flags&&(B[0]=255&d,B[1]=d>>>8&255,n.check=I(n.check,B,2,0)),u=d=0,n.mode=3;case 3:for(;u<32;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}n.head&&(n.head.time=d),512&n.flags&&(B[0]=255&d,B[1]=d>>>8&255,B[2]=d>>>16&255,B[3]=d>>>24&255,n.check=I(n.check,B,4,0)),u=d=0,n.mode=4;case 4:for(;u<16;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}n.head&&(n.head.xflags=255&d,n.head.os=d>>8),512&n.flags&&(B[0]=255&d,B[1]=d>>>8&255,n.check=I(n.check,B,2,0)),u=d=0,n.mode=5;case 5:if(1024&n.flags){for(;u<16;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}n.length=d,n.head&&(n.head.extra_len=d),512&n.flags&&(B[0]=255&d,B[1]=d>>>8&255,n.check=I(n.check,B,2,0)),u=d=0}else n.head&&(n.head.extra=null);n.mode=6;case 6:if(1024&n.flags&&((h=s<(h=n.length)?s:h)&&(n.head&&(x=n.head.extra_len-n.length,n.head.extra||(n.head.extra=new Array(n.head.extra_len)),L.arraySet(n.head.extra,r,a,h,x)),512&n.flags&&(n.check=I(n.check,r,h,a)),s-=h,a+=h,n.length-=h),n.length))break e;n.length=0,n.mode=7;case 7:if(2048&n.flags){if(0===s)break e;for(h=0;x=r[a+h++],n.head&&x&&n.length<65536&&(n.head.name+=String.fromCharCode(x)),x&&h<s;);if(512&n.flags&&(n.check=I(n.check,r,h,a)),s-=h,a+=h,x)break e}else n.head&&(n.head.name=null);n.length=0,n.mode=8;case 8:if(4096&n.flags){if(0===s)break e;for(h=0;x=r[a+h++],n.head&&x&&n.length<65536&&(n.head.comment+=String.fromCharCode(x)),x&&h<s;);if(512&n.flags&&(n.check=I(n.check,r,h,a)),s-=h,a+=h,x)break e}else n.head&&(n.head.comment=null);n.mode=9;case 9:if(512&n.flags){for(;u<16;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(d!==(65535&n.check)){e.msg="header crc mismatch",n.mode=30;break}u=d=0}n.head&&(n.head.hcrc=n.flags>>9&1,n.head.done=!0),e.adler=n.check=0,n.mode=12;break;case 10:for(;u<32;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}e.adler=n.check=F(d),u=d=0,n.mode=11;case 11:if(0===n.havedict)return e.next_out=i,e.avail_out=l,e.next_in=a,e.avail_in=s,n.hold=d,n.bits=u,2;e.adler=n.check=1,n.mode=12;case 12:if(5===t||6===t)break e;case 13:if(n.last)d>>>=7&u,u-=7&u,n.mode=27;else{for(;u<3;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}switch(n.last=1&d,--u,3&(d>>>=1)){case 0:n.mode=14;break;case 1:var T,T=R=void 0,R=n;if(H){for(Z=new L.Buf32(512),j=new L.Buf32(32),T=0;T<144;)R.lens[T++]=8;for(;T<256;)R.lens[T++]=9;for(;T<280;)R.lens[T++]=7;for(;T<288;)R.lens[T++]=8;for(P(1,R.lens,0,288,Z,0,R.work,{bits:9}),T=0;T<32;)R.lens[T++]=5;P(2,R.lens,0,32,j,0,R.work,{bits:5}),H=!1}if(R.lencode=Z,R.lenbits=9,R.distcode=j,R.distbits=5,n.mode=20,6!==t)break;d>>>=2,u-=2;break e;case 2:n.mode=17;break;case 3:e.msg="invalid block type",n.mode=30}d>>>=2,u-=2}break;case 14:for(d>>>=7&u,u-=7&u;u<32;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if((65535&d)!=(d>>>16^65535)){e.msg="invalid stored block lengths",n.mode=30;break}if(n.length=65535&d,u=d=0,n.mode=15,6===t)break e;case 15:n.mode=16;case 16:if(h=n.length){if(0===(h=l<(h=s<h?s:h)?l:h))break e;L.arraySet(o,r,a,h,i),s-=h,a+=h,l-=h,i+=h,n.length-=h}else n.mode=12;break;case 17:for(;u<14;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(n.nlen=257+(31&d),d>>>=5,u-=5,n.ndist=1+(31&d),d>>>=5,u-=5,n.ncode=4+(15&d),d>>>=4,u-=4,286<n.nlen||30<n.ndist){e.msg="too many length or distance symbols",n.mode=30;break}n.have=0,n.mode=18;case 18:for(;n.have<n.ncode;){for(;u<3;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}n.lens[U[n.have++]]=7&d,d>>>=3,u-=3}for(;n.have<19;)n.lens[U[n.have++]]=0;if(n.lencode=n.lendyn,n.lenbits=7,S={bits:n.lenbits},_=P(0,n.lens,0,19,n.lencode,0,n.work,S),n.lenbits=S.bits,_){e.msg="invalid code lengths set",n.mode=30;break}n.have=0,n.mode=19;case 19:for(;n.have<n.nlen+n.ndist;){for(;p=(C=n.lencode[d&(1<<n.lenbits)-1])>>>16&255,w=65535&C,!((g=C>>>24)<=u);){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(w<16)d>>>=g,u-=g,n.lens[n.have++]=w;else{if(16===w){for(E=g+2;u<E;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(d>>>=g,u-=g,0===n.have){e.msg="invalid bit length repeat",n.mode=30;break}x=n.lens[n.have-1],h=3+(3&d),d>>>=2,u-=2}else if(17===w){for(E=g+3;u<E;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}x=0,h=3+(7&(d>>>=g)),d>>>=3,u=u-g-3}else{for(E=g+7;u<E;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}x=0,h=11+(127&(d>>>=g)),d>>>=7,u=u-g-7}if(n.have+h>n.nlen+n.ndist){e.msg="invalid bit length repeat",n.mode=30;break}for(;h--;)n.lens[n.have++]=x}}if(30===n.mode)break;if(0===n.lens[256]){e.msg="invalid code -- missing end-of-block",n.mode=30;break}if(n.lenbits=9,S={bits:n.lenbits},_=P(1,n.lens,0,n.nlen,n.lencode,0,n.work,S),n.lenbits=S.bits,_){e.msg="invalid literal/lengths set",n.mode=30;break}if(n.distbits=6,n.distcode=n.distdyn,S={bits:n.distbits},_=P(2,n.lens,n.nlen,n.ndist,n.distcode,0,n.work,S),n.distbits=S.bits,_){e.msg="invalid distances set",n.mode=30;break}if(n.mode=20,6===t)break e;case 20:n.mode=21;case 21:if(6<=s&&258<=l){e.next_out=i,e.avail_out=l,e.next_in=a,e.avail_in=s,n.hold=d,n.bits=u,A(e,f),i=e.next_out,o=e.output,l=e.avail_out,a=e.next_in,r=e.input,s=e.avail_in,d=n.hold,u=n.bits,12===n.mode&&(n.back=-1);break}for(n.back=0;p=(C=n.lencode[d&(1<<n.lenbits)-1])>>>16&255,w=65535&C,!((g=C>>>24)<=u);){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(p&&0==(240&p)){for(v=g,y=p,k=w;p=(C=n.lencode[k+((d&(1<<v+y)-1)>>v)])>>>16&255,w=65535&C,!(v+(g=C>>>24)<=u);){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}d>>>=v,u-=v,n.back+=v}if(d>>>=g,u-=g,n.back+=g,n.length=w,0===p){n.mode=26;break}if(32&p){n.back=-1,n.mode=12;break}if(64&p){e.msg="invalid literal/length code",n.mode=30;break}n.extra=15&p,n.mode=22;case 22:if(n.extra){for(E=n.extra;u<E;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}n.length+=d&(1<<n.extra)-1,d>>>=n.extra,u-=n.extra,n.back+=n.extra}n.was=n.length,n.mode=23;case 23:for(;p=(C=n.distcode[d&(1<<n.distbits)-1])>>>16&255,w=65535&C,!((g=C>>>24)<=u);){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(0==(240&p)){for(v=g,y=p,k=w;p=(C=n.distcode[k+((d&(1<<v+y)-1)>>v)])>>>16&255,w=65535&C,!(v+(g=C>>>24)<=u);){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}d>>>=v,u-=v,n.back+=v}if(d>>>=g,u-=g,n.back+=g,64&p){e.msg="invalid distance code",n.mode=30;break}n.offset=w,n.extra=15&p,n.mode=24;case 24:if(n.extra){for(E=n.extra;u<E;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}n.offset+=d&(1<<n.extra)-1,d>>>=n.extra,u-=n.extra,n.back+=n.extra}if(n.offset>n.dmax){e.msg="invalid distance too far back",n.mode=30;break}n.mode=25;case 25:if(0===l)break e;if(n.offset>(h=f-l)){if((h=n.offset-h)>n.whave&&n.sane){e.msg="invalid distance too far back",n.mode=30;break}b=h>n.wnext?(h-=n.wnext,n.wsize-h):n.wnext-h,h>n.length&&(h=n.length),m=n.window}else m=o,b=i-n.offset,h=n.length;for(l-=h=l<h?l:h,n.length-=h;o[i++]=m[b++],--h;);0===n.length&&(n.mode=21);break;case 26:if(0===l)break e;o[i++]=n.length,l--,n.mode=21;break;case 27:if(n.wrap){for(;u<32;){if(0===s)break e;s--,d|=r[a++]<<u,u+=8}if(f-=l,e.total_out+=f,n.total+=f,f&&(e.adler=n.check=(n.flags?I:O)(n.check,o,f,i-f)),f=l,(n.flags?d:F(d))!==n.check){e.msg="incorrect data check",n.mode=30;break}u=d=0}n.mode=28;case 28:if(n.wrap&&n.flags){for(;u<32;){if(0===s)break e;s--,d+=r[a++]<<u,u+=8}if(d!==(4294967295&n.total)){e.msg="incorrect length check",n.mode=30;break}u=d=0}n.mode=29;case 29:_=1;break e;case 30:_=-3;break e;case 31:return-4;default:return N}return e.next_out=i,e.avail_out=l,e.next_in=a,e.avail_in=s,n.hold=d,n.bits=u,(n.wsize||f!==e.avail_out&&n.mode<30&&(n.mode<27||4!==t))&&W(e,e.output,e.next_out,f-e.avail_out)?(n.mode=31,-4):(c-=e.avail_in,f-=e.avail_out,e.total_in+=c,e.total_out+=f,n.total+=f,n.wrap&&f&&(e.adler=n.check=(n.flags?I:O)(n.check,o,f,e.next_out-f)),e.data_type=n.bits+(n.last?64:0)+(12===n.mode?128:0)+(20===n.mode||15===n.mode?256:0),(0==c&&0===f||4===t)&&_===D?-5:_)},n.inflateEnd=function(e){var t;return e&&e.state?((t=e.state).window&&(t.window=null),e.state=null,D):N},n.inflateGetHeader=function(e,t){return e&&e.state&&0!=(2&(e=e.state).wrap)?((e.head=t).done=!1,D):N},n.inflateSetDictionary=function(e,t){var n,r=t.length;return!e||!e.state||0!==(n=e.state).wrap&&11!==n.mode?N:11===n.mode&&O(1,t,r,0)!==n.check?-3:W(e,t,r,r)?(n.mode=31,-4):(n.havedict=1,D)},n.inflateInfo="pako inflate (from Nodeca project)"},"zlib/constants.js":function(e,t,n){"use strict";t.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},"zlib/messages.js":function(e,t,n){"use strict";t.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},"zlib/zstream.js":function(e,t,n){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},"zlib/gzheader.js":function(e,t,n){"use strict";t.exports=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}},"zlib/adler32.js":function(e,t,n){"use strict";t.exports=function(e,t,n,r){for(var o=65535&e|0,a=e>>>16&65535|0,i=0;0!==n;){for(n-=i=2e3<n?2e3:n;a=a+(o=o+t[r++]|0)|0,--i;);o%=65521,a%=65521}return o|a<<16|0}},"zlib/crc32.js":function(e,t,n){"use strict";var s=function(){for(var e=[],t=0;t<256;t++){for(var n=t,r=0;r<8;r++)n=1&n?3988292384^n>>>1:n>>>1;e[t]=n}return e}();t.exports=function(e,t,n,r){var o=s,a=r+n;e^=-1;for(var i=r;i<a;i++)e=e>>>8^o[255&(e^t[i])];return-1^e}},"zlib/inffast.js":function(e,t,n){"use strict";t.exports=function(e,t){var n,r,o,a,i,s,l=e.state,d=e.next_in,u=e.input,c=d+(e.avail_in-5),f=e.next_out,h=e.output,b=f-(t-e.avail_out),m=f+(e.avail_out-257),g=l.dmax,p=l.wsize,w=l.whave,v=l.wnext,y=l.window,k=l.hold,x=l.bits,_=l.lencode,S=l.distcode,E=(1<<l.lenbits)-1,C=(1<<l.distbits)-1;e:do{for(x<15&&(k+=u[d++]<<x,x+=8,k+=u[d++]<<x,x+=8),n=_[k&E];;){if(k>>>=r=n>>>24,x-=r,0==(r=n>>>16&255))h[f++]=65535&n;else{if(!(16&r)){if(0==(64&r)){n=_[(65535&n)+(k&(1<<r)-1)];continue}if(32&r){l.mode=12;break e}e.msg="invalid literal/length code",l.mode=30;break e}for(o=65535&n,(r&=15)&&(x<r&&(k+=u[d++]<<x,x+=8),o+=k&(1<<r)-1,k>>>=r,x-=r),x<15&&(k+=u[d++]<<x,x+=8,k+=u[d++]<<x,x+=8),n=S[k&C];;){if(k>>>=r=n>>>24,x-=r,!(16&(r=n>>>16&255))){if(0==(64&r)){n=S[(65535&n)+(k&(1<<r)-1)];continue}e.msg="invalid distance code",l.mode=30;break e}if(a=65535&n,x<(r&=15)&&(k+=u[d++]<<x,(x+=8)<r&&(k+=u[d++]<<x,x+=8)),g<(a+=k&(1<<r)-1)){e.msg="invalid distance too far back",l.mode=30;break e}if(k>>>=r,x-=r,(r=f-b)<a){if(w<(r=a-r)&&l.sane){e.msg="invalid distance too far back",l.mode=30;break e}if(s=y,(i=0)===v){if(i+=p-r,r<o){for(o-=r;h[f++]=y[i++],--r;);i=f-a,s=h}}else if(v<r){if(i+=p+v-r,(r-=v)<o){for(o-=r;h[f++]=y[i++],--r;);if(i=0,v<o){for(o-=r=v;h[f++]=y[i++],--r;);i=f-a,s=h}}}else if(i+=v-r,r<o){for(o-=r;h[f++]=y[i++],--r;);i=f-a,s=h}for(;2<o;)h[f++]=s[i++],h[f++]=s[i++],h[f++]=s[i++],o-=3;o&&(h[f++]=s[i++],1<o&&(h[f++]=s[i++]))}else{for(i=f-a;h[f++]=h[i++],h[f++]=h[i++],h[f++]=h[i++],2<(o-=3););o&&(h[f++]=h[i++],1<o&&(h[f++]=h[i++]))}break}}break}}while(d<c&&f<m);k&=(1<<(x-=(o=x>>3)<<3))-1,e.next_in=d-=o,e.next_out=f,e.avail_in=d<c?c-d+5:5-(d-c),e.avail_out=f<m?m-f+257:257-(f-m),l.hold=k,l.bits=x}},"zlib/inftrees.js":function(e,t,n){"use strict";var A=e("../utils/common"),P=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],D=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],N=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],z=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];t.exports=function(e,t,n,r,o,a,i,s){for(var l,d,u,c,f,h,b,m,g,p=s.bits,w=0,v=0,y=0,k=0,x=0,_=0,S=0,E=0,C=0,B=0,U=null,T=0,R=new A.Buf16(16),L=new A.Buf16(16),O=null,I=0,w=0;w<=15;w++)R[w]=0;for(v=0;v<r;v++)R[t[n+v]]++;for(x=p,k=15;1<=k&&0===R[k];k--);if(k<x&&(x=k),0===k)o[a++]=20971520,o[a++]=20971520,s.bits=1;else{for(y=1;y<k&&0===R[y];y++);for(x<y&&(x=y),w=E=1;w<=15;w++)if((E=(E<<=1)-R[w])<0)return-1;if(0<E&&(0===e||1!==k))return-1;for(L[1]=0,w=1;w<15;w++)L[w+1]=L[w]+R[w];for(v=0;v<r;v++)0!==t[n+v]&&(i[L[t[n+v]]++]=v);if(h=0===e?(U=O=i,19):1===e?(U=P,T-=257,O=D,I-=257,256):(U=N,O=z,-1),w=y,f=a,S=v=B=0,u=-1,c=(C=1<<(_=x))-1,1===e&&852<C||2===e&&592<C)return 1;for(;;){for(g=i[v]<h?(m=0,i[v]):i[v]>h?(m=O[I+i[v]],U[T+i[v]]):(m=96,0),l=1<<(b=w-S),y=d=1<<_;o[f+(B>>S)+(d-=l)]=b<<24|m<<16|g|0,0!==d;);for(l=1<<w-1;B&l;)l>>=1;if(B=0!==l?(B&l-1)+l:0,v++,0==--R[w]){if(w===k)break;w=t[n+i[v]]}if(x<w&&(B&c)!==u){for(f+=y,E=1<<(_=w-(S=0===S?x:S));_+S<k&&!((E-=R[_+S])<=0);)_++,E<<=1;if(C+=1<<_,1===e&&852<C||2===e&&592<C)return 1;o[u=B&c]=x<<24|_<<16|f-a|0}}0!==B&&(o[f+B]=w-S<<24|64<<16|0),s.bits=x}return 0}}};for(t in n)n[t].folder=t.substring(0,t.lastIndexOf("/")+1);function r(e,t){var n=t.match(/^\//)?null:e?t.match(/^\.\.?\//)?o(e.folder+t):a(e,t):o(t);if(n)return n.exports||(n.parent=e,n(r.bind(null,n),n,n.exports={})),n.exports;throw"module not found: "+t}var o=function(e){var t=[];return(e=e.split("/").every(function(e){return".."==e?t.pop():"."==e||""==e||t.push(e)})?t.join("/"):null)?n[e]||n[e+".js"]||n[e+"/index.js"]:null},a=function(e,t){return e?o(e.folder+"node_modules/"+t)||a(e.parent,t):null};return r(null,e)},decompress:function(e){this.exports||(this.exports=this.require("inflate.js"));try{return this.exports.inflate(e)}catch(e){}},hasUnityMarker:function(e){var t=10,n="UnityWeb Compressed Content (gzip)";if(t>e.length||31!=e[0]||139!=e[1])return!1;var r=e[3];if(4&r){if(t+2>e.length)return!1;if((t+=2+e[t]+(e[t+1]<<8))>e.length)return!1}if(8&r){for(;t<e.length&&e[t];)t++;if(t+1>e.length)return!1;t++}return 16&r&&String.fromCharCode.apply(null,e.subarray(t,t+n.length+1))==n+"\0"}}};function T(n){x(n);var e=c.cacheControl(c[n]),t=c.companyName&&c.productName?c.cachedFetch:c.fetchWithProgress,r=c[n],r=/file:\/\//.exec(r)?"same-origin":void 0;return t(c[n],{method:"GET",companyName:c.companyName,productName:c.productName,control:e,mode:r,onProgress:function(e){x(n,e)}}).then(function(e){return i=e.parsedBody,s=c[n],new Promise(function(e,t){try{for(var n in U){var r,o,a;if(U[n].hasUnityMarker(i))return s&&console.log('You can reduce startup time if you configure your web server to add "Content-Encoding: '+n+'" response header when serving "'+s+'" file.'),(r=U[n]).worker||(o=URL.createObjectURL(new Blob(["this.require = ",r.require.toString(),"; this.decompress = ",r.decompress.toString(),"; this.onmessage = ",function(e){e={id:e.data.id,decompressed:this.decompress(e.data.compressed)};postMessage(e,e.decompressed?[e.decompressed.buffer]:[])}.toString(),"; postMessage({ ready: true });"],{type:"application/javascript"})),r.worker=new Worker(o),r.worker.onmessage=function(e){e.data.ready?URL.revokeObjectURL(o):(this.callbacks[e.data.id](e.data.decompressed),delete this.callbacks[e.data.id])},r.worker.callbacks={},r.worker.nextCallbackId=0),a=r.worker.nextCallbackId++,r.worker.callbacks[a]=e,void r.worker.postMessage({id:a,compressed:i},[i.buffer])}e(i)}catch(e){t(e)}});var i,s}).catch(function(e){var t="Failed to download file "+c[n];"file:"==location.protocol?d(t+". Loading web pages via a file:// URL without a web server is not supported by this browser. Please use a local development web server to host Unity content, or use the Unity Build and Run option.","error"):console.error(t)})}function R(){Promise.all([T("frameworkUrl").then(function(e){var s=URL.createObjectURL(new Blob([e],{type:"application/javascript"}));return new Promise(function(a,e){var i=document.createElement("script");i.src=s,i.onload=function(){if("undefined"==typeof unityFramework||!unityFramework){var e,t=[["br","br"],["gz","gzip"]];for(e in t){var n,r=t[e];if(c.frameworkUrl.endsWith("."+r[0]))return n="Unable to parse "+c.frameworkUrl+"!","file:"==location.protocol?void d(n+" Loading pre-compressed (brotli or gzip) content via a file:// URL without a web server is not supported by this browser. Please use a local development web server to host compressed Unity content, or use the Unity Build and Run option.","error"):(n+=' This can happen if build compression was enabled but web server hosting the content was misconfigured to not serve the file with HTTP Response Header "Content-Encoding: '+r[1]+'" present. Check browser Console and Devtools Network tab to debug.',"br"==r[0]&&"http:"==location.protocol&&(r=-1!=["localhost","127.0.0.1"].indexOf(location.hostname)?"":"Migrate your server to use HTTPS.",n=/Firefox/.test(navigator.userAgent)?"Unable to parse "+c.frameworkUrl+'!<br>If using custom web server, verify that web server is sending .br files with HTTP Response Header "Content-Encoding: br". Brotli compression may not be supported in Firefox over HTTP connections. '+r+' See <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1670675">https://bugzilla.mozilla.org/show_bug.cgi?id=1670675</a> for more information.':"Unable to parse "+c.frameworkUrl+'!<br>If using custom web server, verify that web server is sending .br files with HTTP Response Header "Content-Encoding: br". Brotli compression may not be supported over HTTP connections. Migrate your server to use HTTPS.'),void d(n,"error"))}d("Unable to parse "+c.frameworkUrl+"! The file is corrupt, or compression was misconfigured? (check Content-Encoding HTTP Response Header on web server)","error")}var o=unityFramework;unityFramework=null,i.onload=null,URL.revokeObjectURL(s),a(o)},i.onerror=function(e){d("Unable to load file "+c.frameworkUrl+"! Check that the file exists on the remote server. (also check browser Console and Devtools Network tab to debug)","error")},document.body.appendChild(i),c.deinitializers.push(function(){document.body.removeChild(i)})})}),T("codeUrl")]).then(function(e){c.wasmBinary=e[1],e[0](c)});var e=T("dataUrl");c.preRun.push(function(){c.addRunDependency("dataUrl"),e.then(function(e){var t=new DataView(e.buffer,e.byteOffset,e.byteLength),n=0,r="UnityWebData1.0\0";if(!String.fromCharCode.apply(null,e.subarray(n,n+r.length))==r)throw"unknown data format";var o=t.getUint32(n+=r.length,!0);for(n+=4;n<o;){var a=t.getUint32(n,!0),i=(n+=4,t.getUint32(n,!0)),s=(n+=4,t.getUint32(n,!0)),l=(n+=4,String.fromCharCode.apply(null,e.subarray(n,n+s)));n+=s;for(var d=0,u=l.indexOf("/",d)+1;0<u;d=u,u=l.indexOf("/",d)+1)c.FS_createPath(l.substring(0,d),l.substring(d,u-1),!0,!0);c.FS_createDataFile(l,null,e.subarray(a,a+i),!0,!0,!0)}c.removeRunDependency("dataUrl")})})}return new Promise(function(e,t){c.SystemInfo.hasWebGL?1==c.SystemInfo.hasWebGL?t('Your browser does not support graphics API "WebGL 2" which is required for this content.'):c.SystemInfo.hasWasm?(1==c.SystemInfo.hasWebGL&&c.print('Warning: Your browser does not support "WebGL 2" Graphics API, switching to "WebGL 1"'),c.startupErrorHandler=t,l(0),c.postRun.push(function(){l(1),delete c.startupErrorHandler,e(y)}),R()):t("Your browser does not support WebAssembly."):t("Your browser does not support WebGL.")})}\ No newline at end of filediff --git a/frontend/public/unity/Build/wms.wasm.unityweb b/frontend/public/unity/Build/wms.wasm.unitywebnew file mode 100644index 0000000..a1df378Binary files /dev/null and b/frontend/public/unity/Build/wms.wasm.unityweb differdiff --git a/frontend/public/unity/index.html b/frontend/public/unity/index.htmlnew file mode 100644index 0000000..4d6d909--- /dev/null+++ b/frontend/public/unity/index.html@@ -0,0 +1,199 @@+<!DOCTYPE html>+<html lang="en-us">+<head>+ <meta charset="utf-8">+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type">+ <title>WMS</title>+</head>+<style>+ html {+ height: 100%;+ }++ body {+ padding: 0;+ margin: 0;+ width: 100%;+ height: 100%;+ overflow: hidden;+ }++ ::-webkit-scrollbar {+ display: none !important; /* Chrome Safari */+ }+</style>+<body>+<div id="unity-container" class="unity-desktop" style="width: 100%;height: 100%;overflow: hidden">+ <canvas id="unity-canvas" style="width: 100%;height: 100%;overflow: hidden"></canvas>+ <div id="unity-loading-bar">+ <div id="unity-logo"></div>+ <div id="unity-progress-bar-empty">+ <div id="unity-progress-bar-full"></div>+ </div>+ </div>+ <!-- <div id='unity-warning'></div>-->+ <!-- <div id="unity-footer">-->+ <!-- <div id="unity-webgl-logo"></div>-->+ <!-- <div id="unity-fullscreen-button"></div>-->+ <!-- <div id="unity-build-title">My project</div>-->+ <!-- </div>-->+</div>+<script>+ var container = document.querySelector('#unity-container')+ var canvas = document.querySelector('#unity-canvas')+ var loadingBar = document.querySelector('#unity-loading-bar')+ var progressBarFull = document.querySelector('#unity-progress-bar-full')+ var fullscreenButton = document.querySelector('#unity-fullscreen-button')+ var warningBanner = document.querySelector('#unity-warning')++ // Shows a temporary message banner/ribbon for a few seconds, or+ // a permanent error message on top of the canvas if type=='error'.+ // If type=='warning', a yellow highlight color is used.+ // Modify or remove this function to customize the visually presented+ // way that non-critical warnings and error messages are presented to the+ // user.+ function unityShowBanner(msg, type) {+ function updateBannerVisibility() {+ warningBanner.style.display = warningBanner.children.length ? 'block' : 'none'+ }++ var div = document.createElement('div')+ div.innerHTML = msg+ warningBanner.appendChild(div)+ if (type == 'error') {+ div.style = 'background: red; padding: 10px;'+ } else {+ if (type == 'warning') div.style = 'background: yellow; padding: 10px;'+ setTimeout(function () {+ warningBanner.removeChild(div)+ updateBannerVisibility()+ }, 5000)+ }+ updateBannerVisibility()+ }++ var buildUrl = 'Build'+ var loaderUrl = buildUrl + '/wms.loader.js'+ var config = {+ dataUrl: buildUrl + '/wms.data.unityweb',+ frameworkUrl: buildUrl + '/wms.framework.js.unityweb',+ codeUrl: buildUrl + '/wms.wasm.unityweb',+ streamingAssetsUrl: 'StreamingAssets',+ companyName: 'DefaultCompany',+ productName: 'My project',+ productVersion: '0.1',+ showBanner: unityShowBanner+ }++ // By default Unity keeps WebGL canvas render target size matched with+ // the DOM size of the canvas element (scaled by window.devicePixelRatio)+ // Set this to false if you want to decouple this synchronization from+ // happening inside the engine, and you would instead like to size up+ // the canvas DOM size and WebGL render target sizes yourself.+ // config.matchWebGLToCanvasSize = false;++ if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {+ // Mobile device style: fill the whole browser client area with the game canvas:++ var meta = document.createElement('meta')+ meta.name = 'viewport'+ meta.content = 'width=device-width, height=device-height, initial-scale=1.0, user-scalable=no, shrink-to-fit=yes'+ document.getElementsByTagName('head')[0].appendChild(meta)+ container.className = 'unity-mobile'+ canvas.className = 'unity-mobile'++ // To lower canvas resolution on mobile devices to gain some+ // performance, uncomment the following line:+ // config.devicePixelRatio = 1;++ unityShowBanner('WebGL builds are not supported on mobile devices.')+ } else {+ // Desktop style: Render the game canvas in a window that can be maximized to fullscreen:++ canvas.style.width = '100%'+ canvas.style.height = '100%'+ }++ loadingBar.style.display = 'block'++ var script = document.createElement('script')+ script.src = loaderUrl+ var WMSUnityInstance+ script.onload = () => {+ let timer = null;+ createUnityInstance(canvas, config, (progress) => {+ if (!timer) {+ timer = setTimeout(() => {+ LoadingProgress(progress)+ timer = null;+ }, 500);+ }+ })+ .then((unityInstance) => {+ loadingBar.style.display = 'none'+ WMSUnityInstance = unityInstance+ LoadSuccess()+ })+ .catch((message) => {+ alert(message)+ })+ }+ document.body.appendChild(script)++ function LoadingProgress(progress) {+ console.log(progress)+ window.parent.postMessage({+ guid: progress,+ event: 'loadingProgress'+ }, '*')+ }++ function LoadSuccess() {+ window.parent.postMessage({+ guid: 'loadSuccess',+ event: 'loadSuccess'+ }, '*')+ }++ function SendStart(s) {+ window.parent.postMessage({+ guid: s,+ event: 'start'+ }, '*')+ }++ function SendFinish(s) {+ window.parent.postMessage({+ guid: s,+ event: 'finish'+ }, '*')+ }++ function SendSelectBreak() {+ window.parent.postMessage({+ guid: 'selectBreak',+ event: 'selectBreak'+ }, '*')+ }++ function SendSelectFactory(s) {+ window.parent.postMessage({+ guid: s,+ event: 'select'+ }, '*')+ }++ window.parent.addEventListener('message', function (e) {+ if (e.data.event === 'sendData') {+ WMSUnityInstance.SendMessage('Init', 'CreateArea', e.data.guid)+ }+ if (e.data.event === 'selectShelfItem') {+ WMSUnityInstance.SendMessage('Init', 'MoveToProduct', e.data.guid)+ }+ if (e.data.event === 'returnToUpper') {+ WMSUnityInstance.SendMessage('Init', 'ReturnToUpper', e.data.guid)+ }+ })+</script>+</body>+</html>diff --git a/frontend/script.d.ts b/frontend/script.d.tsnew file mode 100644index 0000000..2bf9fb5--- /dev/null+++ b/frontend/script.d.ts@@ -0,0 +1 @@+declare module 'vue3-print-nb'\ No newline at end of filediff --git a/frontend/src/api/base/commodityManagementSetting.ts b/frontend/src/api/base/commodityManagementSetting.tsindex a05533b..d031258 100644--- a/frontend/src/api/base/commodityManagementSetting.ts+++ b/frontend/src/api/base/commodityManagementSetting.ts@@ -1,13 +1,13 @@import http from '@/utils/http/request'import { PageConfigProps } from '@/types/System/Form'-import { CommodityVO } from '@/types/Base/CommodityManagement'+import { CommodityVO, UpdateSaftyStockReqBodyVO } from '@/types/Base/CommodityManagement'// Find Data by Paginationexport const getSpuList = (data: PageConfigProps) => http({- url: '/spu/list',- method: 'post',- data-})+ url: '/spu/list',+ method: 'post',+ data+ })// Add a new formexport const addSpu = (data: CommodityVO) => http({@@ -31,3 +31,10 @@ export const deleteSpu = (id: number) => http({id}})++// Update safety stock+export const updateSaftyStock = (data: { sku_id: number; detailList: UpdateSaftyStockReqBodyVO[] }) => http({+ url: '/spu/sku-safety-stock',+ method: 'put',+ data+ })diff --git a/frontend/src/api/base/printSolution.ts b/frontend/src/api/base/printSolution.tsnew file mode 100644index 0000000..55f93bc--- /dev/null+++ b/frontend/src/api/base/printSolution.ts@@ -0,0 +1,35 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { PrintSolutionVO, PrintSolutionGetByPathVo } from '@/types/Base/PrintSolution'++// Find Data by Pagination+export const getPrintSolutionList = (data: PageConfigProps) => http({+ url: '/PrintSolution/list',+ method: 'post',+ data+})+// Get user menu form+export const addPrintSolution = (data: PrintSolutionVO) => http({+ url: '/PrintSolution',+ method: 'post',+ data+})+// Update form+export const updatePrintSolution = (data: PrintSolutionVO) => http({+ url: '/PrintSolution',+ method: 'put',+ data+})+// Delete form+export const deletePrintSolution = (id: number) => http({+ url: '/PrintSolution',+ method: 'delete',+ params: {+ id+ }+})+export const listByPath = (data: PrintSolutionGetByPathVo) => http({+ url: '/PrintSolution/get-by-path',+ method: 'post',+ data+})\ No newline at end of filediff --git a/frontend/src/api/base/warehouseSetting.ts b/frontend/src/api/base/warehouseSetting.tsindex 53aa7b1..e2bc0e9 100644--- a/frontend/src/api/base/warehouseSetting.ts+++ b/frontend/src/api/base/warehouseSetting.ts@@ -7,118 +7,136 @@ import { GoodsLocationVO, WarehouseAreaVO, WarehouseVO } from '@/types/Base/Ware*/// Find Data by Paginationexport const getWarehouseList = (data: PageConfigProps) => http({- url: '/warehouse/list',- method: 'post',- data- })+ url: '/warehouse/list',+ method: 'post',+ data+})// Add a new warehouseexport const addWarehouse = (data: WarehouseVO) => http({- url: '/warehouse',- method: 'post',- data- })+ url: '/warehouse',+ method: 'post',+ data+})// Update warehouseexport const updateWarehouse = (data: WarehouseVO) => http({- url: '/warehouse',- method: 'put',- data- })+ url: '/warehouse',+ method: 'put',+ data+})// Delete warehouseexport const deleteWarehouse = (id: number) => http({- url: '/warehouse',- method: 'delete',- params: {- id- }- })-- // Get the combobox item with warehouse+ url: '/warehouse',+ method: 'delete',+ params: {+ id+ }+})+// Get warehouse information+export const getWarehouse = (id: number) => http({+ url: '/warehouse',+ method: 'get',+ params: {+ id+ }+})+// Get the combobox item with warehouseexport const getWarehouseSelect = () => http({- url: '/warehouse/select-item',- method: 'get',- })+ url: '/warehouse/select-item',+ method: 'get'+})- // Excel Import+// Excel Importexport const excelImport = (data: Array<WarehouseVO>) => http({url: '/warehouse/excel',method: 'post',data})-- // Get the combobox item with warehouse area++// Get the combobox item with warehouse areaexport const getWarehouseAreaSelect = (warehouse_id: number) => http({- url: '/warehousearea/all',- method: 'get',- params: {- warehouse_id- }- })+ url: '/warehousearea/all',+ method: 'get',+ params: {+ warehouse_id+ }+})/*** Warehouse Area Setting*/// Find Data by Paginationexport const getWarehouseAreaList = (data: PageConfigProps) => http({- url: '/warehousearea/list',- method: 'post',- data- })+ url: '/warehousearea/list',+ method: 'post',+ data+})// Add a new warehouseareaexport const addWarehouseArea = (data: WarehouseAreaVO) => http({- url: '/warehousearea',- method: 'post',- data- })+ url: '/warehousearea',+ method: 'post',+ data+})// Update warehouseareaexport const updateWarehouseArea = (data: WarehouseAreaVO) => http({- url: '/warehousearea',- method: 'put',- data- })+ url: '/warehousearea',+ method: 'put',+ data+})// Delete warehouseareaexport const deleteWarehouseArea = (id: number) => http({- url: '/warehousearea',- method: 'delete',- params: {- id- }- })+ url: '/warehousearea',+ method: 'delete',+ params: {+ id+ }+})/*** Goods Location Setting*/// Find Data by Paginationexport const getGoodsLocationList = (data: PageConfigProps) => http({- url: '/goodslocation/list',- method: 'post',- data- })+ url: '/goodslocation/list',+ method: 'post',+ data+})// Add a new goodslocationexport const addGoodsLocation = (data: GoodsLocationVO) => http({- url: '/goodslocation',- method: 'post',- data- })+ url: '/goodslocation',+ method: 'post',+ data+})+// Get all library location information+export const getGoodsLocation = () => http({+ url: '/goodslocation/all',+ method: 'get'+})// Update goodslocationexport const updateGoodsLocation = (data: GoodsLocationVO) => http({- url: '/goodslocation',- method: 'put',- data- })+ url: '/goodslocation',+ method: 'put',+ data+})// Delete goodslocationexport const deleteGoodsLocation = (id: number) => http({- url: '/goodslocation',- method: 'delete',- params: {- id- }- })+ url: '/goodslocation',+ method: 'delete',+ params: {+ id+ }+})++export const getWarehouseProduct = (data) => http({+ url: '/stock/qrcode-list',+ method: 'post',+ data+})diff --git a/frontend/src/api/sys/system.ts b/frontend/src/api/sys/system.tsnew file mode 100644index 0000000..fb75a15--- /dev/null+++ b/frontend/src/api/sys/system.ts@@ -0,0 +1,9 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'++// Get Log+export const getActionLog = (data: PageConfigProps) => http({+ url: '/actionlog/list',+ method: 'post',+ data+ })diff --git a/frontend/src/api/wms/deliveryManagement.ts b/frontend/src/api/wms/deliveryManagement.tsindex cb6bc59..876b846 100644--- a/frontend/src/api/wms/deliveryManagement.ts+++ b/frontend/src/api/wms/deliveryManagement.ts@@ -1,6 +1,15 @@import http from '@/utils/http/request'import { PageConfigProps } from '@/types/System/Form'-import { addRequestVO, ConfirmOrderVO, PackageVO, WeighVO, DeliveryVO, SignInVO, CancleOrderVO, SetCarrierVO } from '@/types/DeliveryManagement/DeliveryManagement'+import {+ addRequestVO,+ ConfirmOrderVO,+ PackageVO,+ WeighVO,+ DeliveryVO,+ SignInVO,+ CancleOrderVO,+ SetCarrierVO+} from '@/types/DeliveryManagement/DeliveryManagement'// Get Pre shipmentexport const getShipment = (data: PageConfigProps) => http({@@ -65,7 +74,8 @@ export const getPackaged = (data: PageConfigProps) => http({method: 'post',data: {...data,- sqlTitle: 'dispatch_status=4'+ // sqlTitle: 'dispatch_status=4'+ sqlTitle: 'package'}})@@ -85,7 +95,8 @@ export const getWeighed = (data: PageConfigProps) => http({method: 'post',data: {...data,- sqlTitle: 'dispatch_status=5'+ // sqlTitle: 'dispatch_status=5'+ sqlTitle: 'weight'}})@@ -105,7 +116,7 @@ export const getDelivery = (data: PageConfigProps) => http({method: 'post',data: {...data,- sqlTitle: 'dispatch_status=6'+ sqlTitle: 'delivery'}})diff --git a/frontend/src/api/wms/deliveryStatistic.ts b/frontend/src/api/wms/deliveryStatistic.tsnew file mode 100644index 0000000..3485260--- /dev/null+++ b/frontend/src/api/wms/deliveryStatistic.ts@@ -0,0 +1,20 @@+import http from '@/utils/http/request'++interface ListProps {+ pageIndex: number+ pageSize: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ sku_name?: string+ warehouse_name?: string+ customer_name?: string+ delivery_date_from?: string+ delivery_date_to?: string+}++export const list = (data: ListProps) => http({+ url: '/stock/delivery-list',+ method: 'post',+ data+ })diff --git a/frontend/src/api/wms/saftyStock.ts b/frontend/src/api/wms/saftyStock.tsnew file mode 100644index 0000000..a5ddd62--- /dev/null+++ b/frontend/src/api/wms/saftyStock.ts@@ -0,0 +1,8 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'++export const list = (data: PageConfigProps) => http({+ url: '/stock/safety-list',+ method: 'post',+ data+ })diff --git a/frontend/src/api/wms/stockAsn.ts b/frontend/src/api/wms/stockAsn.tsindex 86f44d4..ffeb765 100644--- a/frontend/src/api/wms/stockAsn.ts+++ b/frontend/src/api/wms/stockAsn.ts@@ -2,6 +2,102 @@ import http from '@/utils/http/request'import { PageConfigProps } from '@/types/System/Form'import { StockAsnVO, SortingVo, PutawayVo } from '@/types/WMS/StockAsn'+export const listNew = (data: PageConfigProps) => http({+ url: '/asn/asnmaster/list',+ method: 'post',+ data+ })++export const addAsnNew = (data: StockAsnVO) => http({+ url: '/asn/asnmaster',+ method: 'post',+ data+ })++export const updateAsnNew = (data: StockAsnVO) => http({+ url: '/asn/asnmaster',+ method: 'put',+ data+ })++export const confirmArrival = (data: { id: number; arrival_time: string }[]) => http({+ url: '/asn/confirm',+ method: 'put',+ data+ })++export const confirmUnload = (data: { id: number; unloadTime: string; unloadPerson: string; unloadPersonID: number }[]) => http({+ url: '/asn/unload',+ method: 'put',+ data+ })++export const unconfirmArrival = (idList: number[]) => http({+ url: '/asn/confirm-cancel',+ method: 'put',+ data: idList+ })++export const editSorting = (data: { asn_id: number; series_number: string; sorted_qty: number }[]) => http({+ url: '/asn/sorting',+ method: 'put',+ data+ })++export const modifySorting = (data: { asn_id: number; series_number: string; sorted_qty: number }[]) => http({+ url: '/asn/sorting-modify',+ method: 'put',+ data+ })++export const getSorting = (id: number) => http({+ url: '/asn/sorting',+ method: 'get',+ params: {+ asn_id: id+ }+ })++export const getGrouding = (id: number) => http({+ url: '/asn/pending-putaway',+ method: 'get',+ params: {+ id+ }+ })++export const confirmPutaway = (+ data: {+ asn_id: number+ goods_owner_id: number+ series_number: string+ goods_location_id: number+ putaway_qty: number+ }[]+) => http({+ url: '/asn/putaway',+ method: 'put',+ data+ })++export const confirmSorted = (id: number) => http({+ url: '/asn/sorted',+ method: 'put',+ data: [id]+ })++export const revokeUnload = (idList: number[]) => http({+ url: '/asn/unload-cancel',+ method: 'put',+ data: idList+ })++export const revokeSorting = (idList: number[]) => http({+ url: '/asn/sorted-cancel',+ method: 'put',+ data: idList+ })+export const getStockAsnList = (data: PageConfigProps) => http({url: '/asn/list',method: 'post',diff --git a/frontend/src/assets/img/apifox.png b/frontend/src/assets/img/apifox.pngnew file mode 100644index 0000000..bbbf615Binary files /dev/null and b/frontend/src/assets/img/apifox.png differdiff --git a/frontend/src/components/codeDialog/barCodeDialog.vue b/frontend/src/components/codeDialog/barCodeDialog.vuenew file mode 100644index 0000000..6dcc21f--- /dev/null+++ b/frontend/src/components/codeDialog/barCodeDialog.vue@@ -0,0 +1,175 @@+<template>+ <v-dialog v-model="data.showDialog" :persistent="true" transition="dialog-top-transition" width="auto">+ <template #default>+ <v-card :title="$t('system.page.preView')">+ <v-card-text>+ <div class="print-area-container">+ <div class="print-area-scroll">+ <div+ id="printArea"+ :style="{+ 'grid-template-columns': `repeat(${data.rowsNumber},1fr)`,+ rowGap: `${data.gridRowGap}px`,+ columnGap: `${data.gridColumnGap}px`+ }"+ class="printArea"+ >+ <div v-for="(item, index) in data.printData" :key="index" class="code-container">+ <svg :id="'printBarCode' + item.id"></svg>+ </div>+ </div>+ </div>+ </div>+ </v-card-text>++ <v-card-actions class="justify-space-between">+ <div class="row-number-input">+ <v-row no-gutters>+ <v-col cols="6" class="col">+ <div class="colText">+ <v-text-field+ v-model.number="data.rowsNumber"+ hide-details="auto"+ :label="$t('system.page.rowsNumber')"+ @update:model-value="method.changePrintParams"+ ></v-text-field>+ </div>+ </v-col>+ <v-col cols="6" class="col">+ <div class="colText">+ <v-text-field+ v-model.number="data.gridRowGap"+ hide-details="auto"+ :label="$t('system.page.gridRowGap')"+ @update:model-value="method.changePrintParams"+ ></v-text-field>+ </div>+ </v-col>+ </v-row>+ </div>+ <div class="padding-lr-16">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" :disabled="isDisabled" variant="text">{{ $t('system.page.print') }}</v-btn>+ </div>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { computed, nextTick, reactive, watch } from 'vue'+import JsBarcode from 'jsbarcode'+import { setStorage, getStorage } from '@/utils/common'++const props = defineProps<{+ menu: string+}>()++const data = reactive({+ showDialog: false,+ printData: [] as any,+ rowsNumber: 5,+ gridColumnGap: 15,+ gridRowGap: 15+})+const isDisabled = computed(() => data.printData.length === 0)++watch(+ () => data.printData,+ () => {+ if (data.printData.length < 5) {+ data.rowsNumber = data.printData.length+ } else {+ data.rowsNumber = 5+ }+ }+)++const method = reactive({+ changePrintParams: () => {+ const storage = {+ cols: data.rowsNumber,+ rs: data.gridRowGap+ }++ setStorage(`BarCode-${ props.menu }`, storage)+ },+ openDialog: (row: any) => {+ try {+ const storage: any = getStorage(`BarCode-${ props.menu }`)++ if (storage) {+ data.rowsNumber = storage.cols+ data.gridRowGap = storage.rs+ }+ } catch {+ data.rowsNumber = 5+ data.gridRowGap = 15+ }++ data.printData = row++ data.showDialog = true++ nextTick(() => {+ for (const item of data.printData) {+ JsBarcode(`#printBarCode${ item.id }`, item.id, {+ fontSize: 12,+ width: 2,+ height: 40,+ displayValue: true+ })+ }+ })+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style lang="less" scoped>+.print-area-container {+ background-color: #efefef;+ padding: 15px;+}++.print-area-scroll {+ overflow: auto;+ max-width: 900px;+ min-width: 300px;+ height: 500px;+}++.printArea {+ display: grid;+ align-items: center;+ // grid-gap: 15px;++ .code-container {+ display: flex;+ align-items: center;+ justify-content: center;+ }+}++.row-number-input {+ width: 350px;+ padding: 0 16px;+}++.colText {+ box-sizing: border-box;+ padding: 0 5px;+}++.padding-lr-16 {+ padding: 0 16px;+}+</style>diff --git a/frontend/src/components/codeDialog/qrCodeDialog.vue b/frontend/src/components/codeDialog/qrCodeDialog.vuenew file mode 100644index 0000000..dd19bd0--- /dev/null+++ b/frontend/src/components/codeDialog/qrCodeDialog.vue@@ -0,0 +1,191 @@+<template>+ <v-dialog v-model="data.showDialog" width="auto" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card :title="$t('system.page.preView')">+ <v-card-text>+ <div class="print-area-container">+ <div class="print-area-scroll">+ <div+ id="printArea"+ class="printArea"+ :style="{+ 'grid-template-columns': `repeat(${data.rowsNumber},1fr)`,+ rowGap: `${data.gridRowGap}px`,+ columnGap: `${data.gridColumnGap}px`+ }"+ >+ <div v-for="(item, index) in data.printData" :key="index" class="code-container">+ <div>+ <vue-qr :key="index" :size="150" :auto-color="true" :dot-scale="1" :text="method.formatPrintData(item)"></vue-qr>+ </div>+ <div class="printLabel">+ <slot name="left" :slotData="item"></slot>+ </div>+ </div>+ </div>+ </div>+ </div>+ </v-card-text>++ <v-card-actions class="justify-space-between">+ <div class="row-number-input">+ <v-row no-gutters>+ <v-col cols="6" class="col">+ <div class="colText">+ <v-text-field+ v-model.number="data.rowsNumber"+ hide-details="auto"+ :label="$t('system.page.rowsNumber')"+ @update:model-value="method.changePrintParams"+ ></v-text-field>+ </div>+ </v-col>+ <v-col cols="6" class="col">+ <div class="colText">+ <v-text-field+ v-model.number="data.gridRowGap"+ hide-details="auto"+ :label="$t('system.page.gridRowGap')"+ @update:model-value="method.changePrintParams"+ ></v-text-field>+ </div>+ </v-col>+ </v-row>+ </div>+ <div class="padding-lr-16">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" :disabled="isDisabled" variant="text">{{ $t('system.page.print') }}</v-btn>+ </div>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script setup lang="ts">+import { computed, reactive } from 'vue'+import VueQr from 'vue-qr/src/packages/vue-qr.vue'+import { setStorage, getStorage } from '@/utils/common'++const props = defineProps<{+ menu: string+}>()++const data = reactive({+ showDialog: false,+ printData: [] as any,+ printText: '',+ rowsNumber: 5,+ gridColumnGap: 15,+ gridRowGap: 15+})++const isDisabled = computed(() => data.printData.length === 0)++const method = reactive({+ changePrintParams: () => {+ const storage = {+ cols: data.rowsNumber,+ rs: data.gridRowGap+ }++ setStorage(`QRCode-${ props.menu }`, storage)+ },+ openDialog: (row: any) => {+ try {+ const storage: any = getStorage(`QRCode-${ props.menu }`)++ if (storage) {+ data.rowsNumber = storage.cols+ data.gridRowGap = storage.rs+ }+ } catch {+ data.rowsNumber = 5+ data.gridRowGap = 15+ }++ data.printData = row+ data.showDialog = true+ },+ formatPrintData: (val: any) => JSON.stringify({+ id: val.id,+ type: val.type+ }),+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.print-area-container {+ background-color: #efefef;+ padding: 15px;+}++.print-area-scroll {+ overflow: auto;+ max-width: 900px;+ min-width: 300px;+ height: 500px;+}++.printArea {+ display: grid;+ // grid-gap: 15px;++ .code-container {+ width: 183px;+ box-sizing: border-box;+ padding: 2px 10px;+ padding-bottom: 10px;++ border: 1px solid #000;++ background-color: #fff;++ display: flex;+ flex-wrap: wrap;+ align-items: center;+ justify-content: center;+ }+}+.row-number-input {+ width: 350px;+ padding: 0 16px;+}++.colText {+ box-sizing: border-box;+ padding: 0 5px;+}++.padding-lr-16 {+ padding: 0 16px;+}+.printLabel {+ width: 100%;+ text-align: center;++ font-size: 12px;+ font-weight: bold;+ // padding-left: 15px;+ white-space: nowrap;+ overflow: hidden; /* 隐藏溢出的文本 */+ text-overflow: ellipsis; /* 显示省略号 */++ .labelTitle {+ opacity: 0.7;+ font-weight: 600;+ }++ div {+ width: 100%;+ }+}+</style>diff --git a/frontend/src/components/custom-filter-select.vue b/frontend/src/components/custom-filter-select.vuenew file mode 100644index 0000000..ea9b26e--- /dev/null+++ b/frontend/src/components/custom-filter-select.vue@@ -0,0 +1,122 @@+<template>+ <div :id="`id${data.dynamicID}`">+ <v-combobox+ ref="comboBoxRef"+ v-model="data.cacheObj"+ :label="props.label"+ :items="cacheItems"+ :item-title="props.itemTitle"+ :rules="props.rules"+ variant="outlined"+ clearable+ autocomplete="off"+ return-object+ @click:clear="method.valueClear"+ @update:model-value="method.valueChange"+ >+ </v-combobox>+ </div>+</template>++<script setup lang="tsx">+import { reactive, ref, onMounted, nextTick, computed } from 'vue'+import { generateUUID } from '@/utils/common'++const emit = defineEmits(['update:modelValue'])++const props = defineProps<{+ modelValue: any+ items: any[]+ itemTitle: string+ label: string+ rules: any[]+ mapping: any+}>()++const comboBoxRef = ref()++const data = reactive({+ cacheObj: undefined as any,+ dynamicID: generateUUID()+})++const method = reactive({+ // 点击清空+ valueClear: () => {+ data.cacheObj = undefined++ const cache = { ...props.modelValue }++ for (const item of props.mapping) {+ cache[item.in] = ''+ }++ emit('update:modelValue', cache)+ },+ // 值改变+ valueChange: (val: any) => {+ if (val) {+ const cache = { ...props.modelValue }++ for (const item of props.mapping) {+ cache[item.in] = val[item.out]+ }+ emit('update:modelValue', cache)+ }+ },+ // 选择框光标消失+ selectBlur: () => {+ if (typeof data.cacheObj === 'string') {+ data.cacheObj = undefined+ }+ }+})++onMounted(() => {+ // 处理原始值+ let cache: any = {}++ for (const item of props.mapping) {+ if (props.modelValue[item.in] || props.modelValue[item.in] === 0) {+ cache[item.out] = props.modelValue[item.in]+ } else {+ cache[item.out] = ''+ }+ }++ if (Object.values(cache).filter((item) => item !== '' && item !== 0).length === 0) {+ cache = undefined+ }++ data.cacheObj = cache++ // 挂载失去标点参数+ nextTick(() => {+ const inputDom: any = document.querySelector(`#${ `id${ data.dynamicID }` } > div > div.v-input__control > div > div.v-field__field > div > input`)+ if (inputDom) {+ inputDom.onblur = method.selectBlur+ }+ })+})++const cacheItems = computed(() => {+ // 处理Items+ const cacheItems: any = [...props.items]++ for (const item of cacheItems) {+ for (const key of Object.keys(item)) {+ // 处理数据, 保证下拉框正常运行+ if (item[key] === 0) {+ continue+ }+ if (!item[key]) {+ item[key] = ''+ }+ }+ }++ return cacheItems+})+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/components/custom-pager.vue b/frontend/src/components/custom-pager.vueindex bc77704..ec22975 100644--- a/frontend/src/components/custom-pager.vue+++ b/frontend/src/components/custom-pager.vue@@ -82,7 +82,7 @@ const method = reactive({})const PAGER_SIZE_OPTION = computed(() => {- const res = []+ const res: any = []for (const pageSize of props.pageSizes) {res.push({ label: `${ pageSize }${ i18n.global.t('system.pager.pageSizes') }`, value: pageSize })}@@ -100,10 +100,12 @@ const PAGER_LENGTH = computed(() => {.pagerContainer {color: #666;}-.fl-s{++.fl-s {display: flex;align-items: flex-start;}+.fl-c {display: flex;align-items: center;diff --git a/frontend/src/components/flow/components/addNode.vue b/frontend/src/components/flow/components/addNode.vuenew file mode 100644index 0000000..1e21027--- /dev/null+++ b/frontend/src/components/flow/components/addNode.vue@@ -0,0 +1,191 @@+<template>+ <div class="add-node-btn-box">+ <div class="add-node-btn">+ <v-btn icon="mdi-plus" size="small"></v-btn>+ <!-- <el-popover v-model="data.visible" placement="right-start" popper-class="add-node-popover">+ <div v-if="tip === '审批节点' || tip === '条件'" class="add-node-popover-body">+ <div v-if="tip === '审批节点' || tip === '条件'" class="add-node-popover-item approver" @click="method.addType(2)">+ <div class="item-wrapper">+ <img src="../img/ShenPiRen.png" alt="" class="img-style" />+ </div>+ <p>审批人</p>+ </div>+ <div v-if="tip === '审批节点'" class="add-node-popover-item condition" @click="method.addType(4)">+ <div class="item-wrapper">+ <img src="../img/TiaoJian.png" alt="" class="img-style" />+ </div>+ <p>条件分支</p>+ </div>+ </div>+ <template #reference>+ <button class="btn" type="button">+ <i style="color: #fff" class="el-icon-plus"></i>+ </button>+ </template>+ </el-popover> -->+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'++const emit = defineEmits(['update:childNodeP'])++const props = defineProps<{+ childNodeP: any+ tip: any+}>()++const data = reactive({+ visible: false as boolean,+ parentObj: {} as any,+ selfChildNode: props.childNodeP as any,+ selfTip: props.tip as any+})++const method = reactive({+ guid() {+ let guid = ''+ for (let i = 1; i <= 32; i++) {+ const n = Math.floor(Math.random() * 16.0).toString(16)+ guid += n+ if (i === 8 || i === 12 || i === 16 || i === 20) guid += '-'+ }+ return guid+ },+ addType(type: number) {+ data.visible = false+ let NodeData: any+ if (type !== 4) {+ if (type === 2) {+ NodeData = {+ nodeName: '审批节点',+ error: false,+ type: 2,+ id: 0,+ nodeId: 'approvalID',+ childNode: data.selfChildNode,+ guid: this.guid(),+ // guidFater: this.nodeConfig.guid,+ formJieDian: {+ id: 0,+ detailList: [],+ bFlowID: 0,+ approveLevel: 0,+ nodeName: '',+ passCondition: '1',+ mode: 0,+ origIDForMode: 0,+ nameForMode: '',+ guid: 0,+ valid: '',+ rName: '',+ dName: '',+ modeStr: ''+ }+ }+ }+ } else {+ const guidLuYou: string = method.guid()++ NodeData = {+ nodeName: '路由',+ type: 4,+ nodeId: 'conditionID',+ childNode: data.selfChildNode,+ guid: guidLuYou,+ conditionNodes: [+ {+ nodeName: '条件',+ error: false,+ type: 4,+ id: 0,+ nodeId: 'conditionNode',+ conditionList: [],+ childNode: null,+ guid: this.guid(),+ guidLuYou+ },+ {+ nodeName: '条件',+ error: false,+ type: 4,+ id: 0,+ nodeId: 'conditionNode',+ conditionList: [],+ childNode: null,+ guid: this.guid(),+ guidLuYou+ }+ ]+ }+ }+ emit('update:childNodeP', NodeData)+ }+})+</script>++<style lang="less" scoped>+.add-node-btn-box {+ width: 240px;+ display: inline-flex;+ flex-shrink: 0;+ position: relative;+ &:first-child {+ margin-left: 16px;+ }+ &:before {+ content: '';+ position: absolute;+ top: 1px;+ left: 0px;+ right: 0;+ bottom: 0;+ z-index: -1;+ margin: auto;+ width: 1px;+ // height: 100%;+ background-color: #070707;+ }+}+.img-style {+ width: 36px;+}+.add-node-popover {+ padding: 14px 26px;+ .add-node-popover-body {+ display: flex;+ .add-node-popover-item {+ margin-right: 20px;+ text-align: center;+ cursor: pointer;+ &:last-child {+ margin-right: 0;+ }+ i {+ font-size: 36px;+ }+ p {+ color: #333;+ margin-top: 4px;+ }+ }+ .approver {+ i {+ color: #e6a23c;+ }+ }+ .condition {+ i {+ color: #67c23a;+ }+ }+ .notifier {+ i {+ color: #4880ff;+ }+ }+ }+}+</style>diff --git a/frontend/src/components/flow/components/nodeWrap.vue b/frontend/src/components/flow/components/nodeWrap.vuenew file mode 100644index 0000000..a270963--- /dev/null+++ b/frontend/src/components/flow/components/nodeWrap.vue@@ -0,0 +1,380 @@+<template>+ <div>+ <!-- 每一行内容 -->+ <div v-if="data.selfNodeConfig.type !== 4" class="node-wrap">+ <!-- 每一个卡片 -->+ <div+ v-if="data.selfNodeConfig.type && data.selfNodeConfig.type !== 0"+ class="node-wrap-box"+ :class="(data.selfNodeConfig.type === 1 ? 'start-node' : '') + (data.selfNodeConfig.error ? 'active error' : '')"+ >+ <div @click="method.handleClickCard">+ <!-- 卡片头部 -->+ <div class="title" :style="'background: rgb(' + ['87, 106, 149', '6, 135, 165'][data.selfNodeConfig.type - 1] + ');'">+ <span class="editable-title">{{ data.selfNodeConfig.nodeName }}</span>+ <i v-if="data.selfNodeConfig.type !== 1" class="el-icon-close close" @click.stop="method.delNode()"></i>+ </div>+ <!-- 卡片正文内容 -->+ <div class="content">+ <div v-if="data.selfNodeConfig.type === 1" class="text">+ {{ '类型1' }}+ </div>+ <div v-if="data.selfNodeConfig.type === 2" class="text">+ {{ '类型2' }}+ </div>+ <i class="el-icon-arrow-right arrow"></i>+ </div>+ <!-- 报错提示 -->+ <div v-if="data.selfNodeConfig.error" class="error_tip">+ <i class="el-icon-warning" style="color: rgb(242, 86, 67)"></i>+ </div>+ </div>+ </div>+ <!-- 新增节点元素 -->+ <AddNodeComponent v-model:child-node-p="data.selfNodeConfig.childNode" :tip="'审批节点'" />+ </div>+ <!-- "条件分支" - 类型4 -->+ <div v-if="data.selfNodeConfig.type === 4" class="branch-wrap">+ <div class="branch-box-wrap">+ <div class="branch-box">+ <!-- 添加条件按钮 -->+ <el-button class="add-branch" @click="method.addTerm"> 添加条件 </el-button>+ <!-- 多个条件 -->+ <div v-for="(item, index) in data.selfNodeConfig.conditionNodes" :key="index" class="col-box">+ <div class="condition-node">+ <div class="condition-node-box">+ <div class="auto-judge" :class="item.error ? 'error active' : ''" @click="method.handleClickCard(index)">+ <div class="title-wrapper">+ <span class="editable-title">{{ item.nodeName }}</span>+ <i class="el-icon-close close" @click.stop="method.delCardItem(index)"></i>+ </div>+ <div class="content">+ <!-- <span class="placeholder"> 条件</span> -->+ <div>+ {{+ data.selfNodeConfig.conditionNodes[index].conditionList.length > 0+ ? data.selfNodeConfig.conditionNodes[index].conditionList[0].schemeName+ : ''+ }}+ </div>+ <!-- {{ item.id }} -->+ </div>+ <div v-if="item.error" class="error_tip">+ <i class="el-icon-warning" style="color: rgb(242, 86, 67)"></i>+ </div>+ </div>+ <!-- 添加审批人 -->+ <AddNodeComponent v-model:child-node-p="item.childNode" :tip="'条件'" />+ </div>+ </div>+ <!-- 递归遍历 -->+ <nodeWrap v-if="item.childNode && item.childNode" v-model:node-config="item.childNode" :table-name="tableName"></nodeWrap>+ <div v-if="index === 0" class="top-left-cover-line"></div>+ <div v-if="index === 0" class="bottom-left-cover-line"></div>+ <div v-if="index === data.selfNodeConfig.conditionNodes.length - 1" class="top-right-cover-line"></div>+ <div v-if="index === data.selfNodeConfig.conditionNodes.length - 1" class="bottom-right-cover-line"></div>+ </div>+ </div>+ <!-- 添加节点按钮 -->+ <AddNodeComponent v-model:child-node-p="data.selfNodeConfig.childNode" :node-config="data.selfNodeConfig" :tip="'条件'" />+ </div>+ </div>+ <!-- 递归本体 -->+ <nodeWrap+ v-if="data.selfNodeConfig.childNode && data.selfNodeConfig.childNode"+ v-model:node-config="data.selfNodeConfig.childNode"+ :table-name="tableName"+ ></nodeWrap>+ </div>+</template>++<script lang="ts" setup>+import { reactive, onMounted } from 'vue'+import AddNodeComponent from './addNode.vue'+import { hookComponent } from '@/components/system'++const emit = defineEmits(['update:nodeConfig'])++const props = defineProps<{+ nodeConfig: any+ tableName: any+}>()++const data = reactive({+ drawer: false as boolean,+ indexTiaojian: 0 as number,+ formTiaoJian: {+ schemeName: ''+ } as any,+ selfNodeConfig: props.nodeConfig,+ selfTableName: props.tableName+})++const method = reactive({+ // 生成guid+ guid: () => {+ let guid = ''+ for (let i = 1; i <= 32; i++) {+ const num = Math.floor(Math.random() * 16.0).toString(16)+ guid += num+ if (i === 8 || i === 12 || i === 16 || i === 20) guid += '-'+ }+ return guid+ },+ // 生成guid+ guidGroup: () => {+ let guid = ''+ for (let i = 1; i <= 4; i++) {+ const n = Math.floor(Math.random() * 3.0).toString(3)+ guid += n+ if (i === 4 || i === 10 || i === 16 || i === 20) guid += '-'+ }+ return guid+ },+ // 添加条件组+ addConditionGroup: (flag: any, item: any) => {+ if (!data.formTiaoJian.schemeName) {+ hookComponent.$message({+ type: 'error',+ content: '请输入条件名称'+ })+ return+ }++ // todo 校验+ const result = false++ if (result) {+ if (flag === '1') {+ item.conditionChildrenNodes.push({+ schemeName: item.schemeName,+ conditionGroup: item.conditionGroup,+ ctrlType: '',+ colLabel: '',+ bFlowFilterSetID: 0,+ colName: '',+ compare: '',+ content: '',+ sort: 0,+ formulas: '',+ assertMode: '存在',+ tableName: '',+ guid: '',+ ifOther: '否'+ })+ }+ data.selfNodeConfig.conditionNodes[data.indexTiaojian].conditionList.push({+ conditionChildrenNodes: [],+ conditionGroup: method.guidGroup(),+ schemeName: data.formTiaoJian.schemeName+ })+ }+ },+ // 删除条件组+ removeCondition: (conditonflag: string, index: number, ind: number) => {+ if (conditonflag === 'group') {+ data.selfNodeConfig.conditionNodes[data.indexTiaojian].conditionList.splice(index, 1)+ return+ }+ data.selfNodeConfig.conditionNodes[data.indexTiaojian].conditionList[index].conditionChildrenNodes.splice(ind, 1)+ },+ handleClickCard: (index: number) => {+ console.log('点击卡片')+ },+ // 删除节点+ delNode: () => {+ // this.$emit('update:nodeConfig', this.nodeConfig.childNode)+ },+ // 添加条件+ addTerm: () => {+ data.selfNodeConfig.conditionNodes.push({+ nodeName: '条件',+ error: false,+ type: 4,+ id: 0,+ conditionList: [],+ childNode: null,+ guid: method.guid(),+ guidLuYou: data.selfNodeConfig.guid+ })++ emit('update:nodeConfig', data.selfNodeConfig)+ },+ // 删除条件+ delCardItem: (index: number) => {+ data.selfNodeConfig.conditionNodes.splice(index, 1)+ emit('update:nodeConfig', data.selfNodeConfig)++ // 如果只有一个条件,删除条件的同时,删除条件的子节点+ if (data.selfNodeConfig.conditionNodes.length === 1) {+ if (data.selfNodeConfig.childNode) {+ if (data.selfNodeConfig.conditionNodes[0].childNode) {+ method.reData(data.selfNodeConfig.conditionNodes[0].childNode, data.selfNodeConfig.childNode)+ } else {+ data.selfNodeConfig.conditionNodes[0].childNode = data.selfNodeConfig.childNode+ }+ }+ emit('update:nodeConfig', data.selfNodeConfig.conditionNodes[0].childNode)+ }+ },+ reData: (NodeData: any, addData: any) => {+ if (!NodeData.childNode) {+ NodeData.childNode = addData+ } else {+ method.reData(NodeData.childNode, addData)+ }+ }+})++onMounted(() => {+ console.log(data.selfNodeConfig)+})+</script>++<style scoped lang="less">+//弹框+.set_promoter {+ .el-drawer__header {+ margin-bottom: 0;+ padding: 0 24px;+ border-bottom: 1px solid #ebebeb;++ .title {+ height: 64px;+ line-height: 64px;+ font-size: 20px;+ color: #333;+ justify-content: flex-start;++ i {+ margin-left: 8px;+ font-size: 30px;+ }+ }+ }++ .el-drawer__body {+ overflow-y: auto;+ max-height: calc(100% - 64px);+ padding-bottom: 80px;+ }++ .drawer-content {+ padding: 24px;++ .el-radio {+ margin-bottom: 16px;++ .mark {+ color: #828282;+ }++ &.is-checked {+ .mark {+ color: #4880ff;+ }+ }++ &:last-child {+ margin-bottom: 0;+ }+ }+ }++ .drawer-content-condition {+ padding: 24px 0;++ .condition-conent-group {+ border-bottom: solid 1px #ebebeb;+ padding-bottom: 20px;++ .condition-group-title {+ padding: 0 24px;+ background: #f7f8fa;+ height: 48px;+ border-top: solid 1px #ebebeb;+ border-bottom: solid 1px #ebebeb;+ margin-bottom: 12px;+ display: flex;+ justify-content: space-between;+ align-items: center;+ }++ .condition-group-select {+ padding: 10px 24px 0px 24px;+ display: flex;+ border-bottom: 1px dashed #c2bfbf;+ }++ .remove {+ font-size: 15px;+ color: #828282;++ &:hover {+ cursor: pointer;+ color: red;+ }+ }++ .removedetail {+ font-size: 25px;+ color: #828282;++ &:hover {+ cursor: pointer;+ color: red;+ }+ }++ .mg-bot-10 {+ margin-bottom: 10px;+ }++ .conditionbtn {+ .el-button {+ border: 1px dashed #4880ff;+ width: 110px;+ }+ }+ }++ .conditionbtn {+ padding: 0 24px;+ margin-top: 26px;++ .el-button {+ border: solid 1px #4880ff;+ color: #4880ff;+ width: 123px;+ }+ }+ }++ .set_promoter_footer {+ height: 80px;+ position: absolute;+ bottom: 0;+ left: 0;+ padding: 24px;+ justify-content: flex-end;+ background: #fff;+ width: 100%;+ border-top: 1px solid #ebebeb;+ z-index: 2;+ }++ .icon-icon_explain {+ color: #bfbfbf;+ }+}+.error_tip {+ position: absolute;+ top: 36px;+ right: 0px;+ transform: translate(150%, 0px);++ i {+ font-size: 24px;+ }+}+</style>diff --git a/frontend/src/components/flow/img/ChaoSongRen.png b/frontend/src/components/flow/img/ChaoSongRen.pngnew file mode 100644index 0000000..23521a1Binary files /dev/null and b/frontend/src/components/flow/img/ChaoSongRen.png differdiff --git a/frontend/src/components/flow/img/ShenPiRen.png b/frontend/src/components/flow/img/ShenPiRen.pngnew file mode 100644index 0000000..e934468Binary files /dev/null and b/frontend/src/components/flow/img/ShenPiRen.png differdiff --git a/frontend/src/components/flow/img/TiaoJian.png b/frontend/src/components/flow/img/TiaoJian.pngnew file mode 100644index 0000000..92c6e6dBinary files /dev/null and b/frontend/src/components/flow/img/TiaoJian.png differdiff --git a/frontend/src/components/flow/img/ZoomIn.png b/frontend/src/components/flow/img/ZoomIn.pngnew file mode 100644index 0000000..f3cdec2Binary files /dev/null and b/frontend/src/components/flow/img/ZoomIn.png differdiff --git a/frontend/src/components/flow/img/ZoomOut.png b/frontend/src/components/flow/img/ZoomOut.pngnew file mode 100644index 0000000..65d87a7Binary files /dev/null and b/frontend/src/components/flow/img/ZoomOut.png differdiff --git a/frontend/src/components/flow/workFlow.vue b/frontend/src/components/flow/workFlow.vuenew file mode 100644index 0000000..e7d2608--- /dev/null+++ b/frontend/src/components/flow/workFlow.vue@@ -0,0 +1,1064 @@+<template>+ <div class="approval-flow fd-nav-content">+ <div class="zoom flex">+ <div :class="'zoom-out' + (data.nowVal === 50 ? ' disabled' : '')" @click="method.zoomSize(1)"></div>+ <div class="zoomFont">{{ data.nowVal }}%</div>+ <div :class="'zoom-in' + (data.nowVal === 300 ? ' disabled' : '')" @click="method.zoomSize(2)"></div>+ </div>+ <div id="dingflow-design" class="dingflow-design">+ <div id="box-scale" class="box-scale" :style="'transform: scale(' + data.nowVal / 100 + '); transform-origin: 50% 0px 0px;'">+ <nodeWrap :node-config="data.nodeConfig" :table-name="tableName"></nodeWrap>+ <div class="end-node">+ <div class="end-node-circle"></div>+ <div class="end-node-text">流程结束</div>+ </div>+ </div>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive, onMounted, nextTick } from 'vue'+import nodeWrap from './components/nodeWrap.vue'++defineProps<{+ // nodeConfig: any+ tableName: any+}>()++const data = reactive({+ tipList: [] as any,+ nowVal: 100 as number, // 缩放比例+ nodeConfig: {+ error: false,+ type: 1,+ id: 0,+ guid: 'cf1ed102-13a8-0b32-c7a3-bc8e6a70eb36',+ guidFater: '',+ nodeName: '使用部门',+ bFlowNotice: '',+ bFlowUser: '',+ form: {+ detailListBFlowDetail: [+ {+ id: 3334,+ detailList: [+ {+ id: 3634,+ bFlowID: 3279,+ bFlowDetailID: 3334,+ hrEmployeeID: 69,+ eNum: '002',+ eName: '大燕',+ valid: '是',+ guid: '70b7778b-3d3e-b923-eacf-4f81e09802b0'+ }+ ],+ bFlowID: 3279,+ approveLevel: 0,+ nodeName: '2022',+ passCondition: '1',+ mode: 1,+ origIDForMode: 0,+ nameForMode: '',+ guid: '70b7778b-3d3e-b923-eacf-4f81e09802b0',+ valid: '',+ rName: '',+ dName: '',+ modeStr: '指定人员'+ },+ {+ id: 3336,+ detailList: [+ {+ id: 3633,+ bFlowID: 3279,+ bFlowDetailID: 3336,+ hrEmployeeID: 52,+ eNum: '123',+ eName: '孟小翰',+ valid: '是',+ guid: 'dd82ee45-91d2-ce04-2270-6f75951aceb7'+ }+ ],+ bFlowID: 3279,+ approveLevel: 0,+ nodeName: '其他',+ passCondition: '1',+ mode: 1,+ origIDForMode: 0,+ nameForMode: '',+ guid: 'dd82ee45-91d2-ce04-2270-6f75951aceb7',+ valid: '',+ rName: '',+ dName: '',+ modeStr: '指定人员'+ }+ ],+ detailListBFlowNotice: [],+ detailListBFlowUser: [],+ detailListBFlowLink: [+ {+ id: 3776,+ detailListBFlowFilterScheme: [],+ bFlowID: 3279,+ beforeID: 3334,+ afterID: -1,+ beforeGUID: '70b7778b-3d3e-b923-eacf-4f81e09802b0',+ afterGUID: '',+ guid: '83706c24-0c57-4738-b308-432e4f6c231d',+ sort: 1+ },+ {+ id: 3777,+ detailListBFlowFilterScheme: [],+ bFlowID: 3279,+ beforeID: 3336,+ afterID: -1,+ beforeGUID: 'dd82ee45-91d2-ce04-2270-6f75951aceb7',+ afterGUID: '',+ guid: '9f317b42-11b3-4e35-843d-97dbad71263d',+ sort: 2+ },+ {+ id: 3778,+ detailListBFlowFilterScheme: [+ {+ id: 1116,+ ctrlType: 'string',+ bFlowID: 3279,+ bFlowFilterSetID: 127,+ conditionGroup: '1212-',+ colLabel: '编号',+ colName: 'Num',+ compare: '包含',+ content: '2022',+ sort: 0,+ formulas: '',+ assertMode: '存在',+ tableName: 'SOffer a left join BCustomer b on a.BCustomerID = b.ID',+ guid: '62aa6fd4-aaee-4e05-bccd-f0427a34d830',+ bFlowLinkID: 3778,+ schemeName: '2022',+ ifOther: '否'+ }+ ],+ bFlowID: 3279,+ beforeID: 0,+ afterID: 3334,+ beforeGUID: '',+ afterGUID: '70b7778b-3d3e-b923-eacf-4f81e09802b0',+ guid: '62aa6fd4-aaee-4e05-bccd-f0427a34d830',+ sort: 3+ },+ {+ id: 3779,+ detailListBFlowFilterScheme: [+ {+ id: 1117,+ ctrlType: null,+ bFlowID: 3279,+ bFlowFilterSetID: 0,+ conditionGroup: '2012-',+ colLabel: '',+ colName: '',+ compare: '',+ content: '',+ sort: 0,+ formulas: '',+ assertMode: '存在',+ tableName: '',+ guid: '8a7e261b-a8c8-4ca7-b1de-badae68d5b1a',+ bFlowLinkID: 3779,+ schemeName: '其他',+ ifOther: '是'+ }+ ],+ bFlowID: 3279,+ beforeID: 0,+ afterID: 3336,+ beforeGUID: '',+ afterGUID: 'dd82ee45-91d2-ce04-2270-6f75951aceb7',+ guid: '8a7e261b-a8c8-4ca7-b1de-badae68d5b1a',+ sort: 4+ }+ ],+ id: 3279,+ writer: '管理员',+ writerID: 3,+ writeDate: '2023-02-02 16:00:39',+ locker: '',+ lockerID: 0,+ lockDate: '1900-01-01 00:00:00',+ approveState: '未发起',+ bAuthorityName: 'SOffer',+ alText: '销售报价单',+ name: '其他',+ memo: '',+ valid: '是',+ origID: 0,+ fuZeRen: '大燕',+ fuZeRenID: 69,+ menuArgs: '',+ gongsi: '',+ priorityLevel: 0,+ bFlowMainID: 0+ },+ childNode: {+ nodeName: '路由',+ type: 4,+ nodeId: 'conditionID',+ childNode: null,+ form: 0,+ guid: '564d8a6a-390f-cdc6-321c-1502cbbe21fc',+ conditionNodes: [+ {+ nodeName: '条件',+ error: false,+ type: 4,+ id: 0,+ nodeId: 'conditionNode',+ conditionList: [+ {+ conditionChildrenNodes: [+ {+ schemeName: '2022',+ conditionGroup: '1212-',+ bFlowFilterSetID: 127,+ ctrlType: 'string',+ colLabel: '编号',+ colName: 'Num',+ compare: '包含',+ content: '2022',+ sort: 0,+ formulas: '',+ assertMode: '存在',+ tableName: 'SOffer a left join BCustomer b on a.BCustomerID = b.ID',+ guid: '',+ ifOther: '否'+ }+ ],+ schemeName: '2022',+ conditionGroup: '1212-'+ }+ ],+ childNode: {+ nodeName: '审批节点',+ error: false,+ type: 2,+ id: 0,+ nodeId: 'approvalID',+ childNode: null,+ guid: '70b7778b-3d3e-b923-eacf-4f81e09802b0',+ formJieDian: {+ id: 3334,+ detailList: [+ {+ id: 3634,+ bFlowID: 3279,+ bFlowDetailID: 3334,+ hrEmployeeID: 69,+ eNum: '002',+ eName: '大燕',+ valid: '是',+ guid: '70b7778b-3d3e-b923-eacf-4f81e09802b0'+ }+ ],+ bFlowID: 3279,+ approveLevel: 0,+ nodeName: '2022',+ passCondition: '1',+ mode: 1,+ origIDForMode: 0,+ nameForMode: '',+ guid: '70b7778b-3d3e-b923-eacf-4f81e09802b0',+ valid: '',+ rName: '',+ dName: '',+ modeStr: '指定人员'+ }+ },+ form: 0,+ to: 3334,+ guid: 'e33859ea-27f3-a5ca-7bca-f2917eb4ff78',+ guidLuYou: '564d8a6a-390f-cdc6-321c-1502cbbe21fc'+ },+ {+ nodeName: '条件',+ error: false,+ type: 4,+ id: 0,+ nodeId: 'conditionNode',+ conditionList: [+ {+ conditionChildrenNodes: [+ {+ schemeName: '其他',+ conditionGroup: '2012-',+ bFlowFilterSetID: 0,+ ctrlType: null,+ colLabel: '',+ colName: '',+ compare: '',+ content: '',+ sort: 0,+ formulas: '',+ assertMode: '存在',+ tableName: '',+ guid: '',+ ifOther: '是'+ }+ ],+ schemeName: '其他',+ conditionGroup: '2012-'+ }+ ],+ childNode: {+ nodeName: '审批节点',+ error: false,+ type: 2,+ id: 0,+ nodeId: 'approvalID',+ childNode: null,+ guid: 'dd82ee45-91d2-ce04-2270-6f75951aceb7',+ formJieDian: {+ id: 3336,+ detailList: [+ {+ id: 3633,+ bFlowID: 3279,+ bFlowDetailID: 3336,+ hrEmployeeID: 52,+ eNum: '123',+ eName: '孟小翰',+ valid: '是',+ guid: 'dd82ee45-91d2-ce04-2270-6f75951aceb7'+ }+ ],+ bFlowID: 3279,+ approveLevel: 0,+ nodeName: '其他',+ passCondition: '1',+ mode: 1,+ origIDForMode: 0,+ nameForMode: '',+ guid: 'dd82ee45-91d2-ce04-2270-6f75951aceb7',+ valid: '',+ rName: '',+ dName: '',+ modeStr: '指定人员'+ }+ },+ form: 0,+ to: 3336,+ guid: '75d2de0e-3533-f367-6929-5bc126213b52',+ guidLuYou: '564d8a6a-390f-cdc6-321c-1502cbbe21fc'+ }+ ]+ }+ } as any+})++const method = reactive({+ reErr: (nodeData: any) => {+ if (nodeData.childNode) {+ if (nodeData.childNode.type === 1) {+ // 审批人+ if (nodeData.childNode.error) {+ data.tipList.push({+ name: nodeData.childNode.nodeName,+ type: '审核人'+ })+ }+ method.reErr(nodeData.childNode)+ } else if (nodeData.childNode.type === 2) {+ if (nodeData.childNode.error) {+ data.tipList.push({+ name: nodeData.childNode.nodeName,+ type: '抄送人'+ })+ }+ method.reErr(nodeData.childNode)+ } else if (nodeData.childNode.type === 3) {+ method.reErr(nodeData.childNode.childNode)+ } else if (nodeData.childNode.type === 4) {+ method.reErr(nodeData.childNode)+ for (let i = 0; i < nodeData.childNode.conditionNodes.length; i++) {+ if (nodeData.childNode.conditionNodes[i].error) {+ data.tipList.push({+ name: nodeData.childNode.conditionNodes[i].nodeName,+ type: '条件'+ })+ }+ method.reErr(nodeData.childNode.conditionNodes[i])+ }+ }+ } else {+ nodeData.childNode = null+ }+ },+ // 给数据加preId(递归)+ handleData: (nodeData: any) => {+ if (nodeData.childNode) {+ nodeData.childNode.preId = nodeData.nodeId+ method.handleData(nodeData.childNode)+ }+ return nodeData+ },+ zoomSize: (type: number) => {+ if (type === 1) {+ if (data.nowVal === 50) {+ return+ }+ data.nowVal -= 10+ } else {+ if (data.nowVal === 300) {+ return+ }+ data.nowVal += 10+ }+ }+})++onMounted(() => {+ nextTick(() => {+ window.addEventListener(+ 'mousewheel',+ (event: any) => {+ if (event.ctrlKey === true || event.metaKey) {+ event.preventDefault()+ }+ },+ { passive: false }+ )++ // firefox+ window.addEventListener(+ 'DOMMouseScroll',+ (event: any) => {+ if (event.ctrlKey === true || event.metaKey) {+ event.preventDefault()+ }+ },+ { passive: false }+ )++ // 通过altKey+鼠标滚轮控制nowVal的数值+ const DOM = document.getElementById('dingflow-design')++ if (DOM) {+ DOM.addEventListener('mousewheel', (e: any) => {+ if (e.ctrlKey) {+ if (e.wheelDelta > 0) {+ method.zoomSize(2)+ } else {+ method.zoomSize(1)+ }+ }+ })+ }+ })+})+</script>++<style lang="less">+.approval-flow {+ position: relative;+ .zoom {+ position: absolute;+ height: 30px;+ // width: 125px;+ top: 15px;+ right: 30px;+ z-index: 10;+ display: flex;++ .zoomFont {+ height: 30px;+ width: 45px;++ display: flex;+ justify-content: center;+ align-items: center;+ }++ .zoom-in,+ .zoom-out {+ width: 30px;+ height: 30px;+ background: #fff;+ color: #c1c1cd;+ cursor: pointer;+ background-size: 100%;+ background-repeat: no-repeat;+ }++ .zoom-out {+ background-image: url(./img/ZoomOut.png);+ }++ .zoom-out.disabled {+ opacity: 0.5;+ }++ .zoom-in {+ background-image: url(./img/ZoomIn.png);+ }++ .zoom-in.disabled {+ opacity: 0.5;+ }+ }+ .dingflow-design {+ .box-scale {+ transform: scale(1);+ display: inline-block;+ position: relative;+ // width: calc(100%);+ min-width: 100%;+ padding: 54.5px 0;+ transform-origin: 0 0 0;+ }+ .branch-wrap {+ .branch-box-wrap {+ // margin-left: -240px;+ .auto-judge {+ position: relative;+ width: 250px;+ // min-height: 100px;+ background: #fff;+ border-radius: 4px;+ cursor: pointer;++ .title-wrapper {+ position: relative;+ font-size: 12px;+ color: #333;+ text-align: center;+ height: 38px;+ line-height: 38px;+ // padding: 0 13px 0 0px;+ border-bottom: 1px solid #ebebeb;+ }+ }+ }+ }+ .node-wrap-box {+ display: inline-flex;+ flex-direction: column;+ position: relative;+ width: 200px;+ min-height: 72px;+ background: #fff;+ border-radius: 4px;+ cursor: pointer;+ }+ .node-wrap-box:after {+ pointer-events: none;+ content: '';+ position: absolute;+ top: 0;+ bottom: 0;+ left: 0;+ right: 0;+ z-index: 2;+ border-radius: 4px;+ border: 1px solid transparent;+ transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);+ }+ .end-node {+ border-radius: 50%;+ font-size: 14px;+ color: rgba(25, 31, 37, 0.4);+ text-align: left;+ }+ .end-node .end-node-circle {+ width: 10px;+ height: 10px;+ margin: auto;+ border-radius: 50%;+ background: #dbdcdc;+ }+ .end-node .end-node-text {+ margin-top: 5px;+ text-align: center;+ }+ }+}+.fd-nav-content {+ width: calc(100%);+ height: calc(100%);+ position: relative;+}+.dingflow-design {+ width: calc(100%);+ height: calc(100%);+ background-color: #f5f8ff;+ overflow: auto;+ position: absolute;+}+.dingflow-design .editable-title {+ font-size: 14px;+ // padding-left: 18px;+ width: 100%;+}+.dingflow-design .ie-polyfill-container {+ display: -ms-grid;+ -ms-grid-columns: min-content;+}++.dingflow-design .node-wrap {+ display: inline-flex;+ flex-direction: column;+ -webkit-box-pack: start;+ -ms-flex-pack: start;+ justify-content: flex-start;+ -webkit-box-align: center;+ -ms-flex-align: center;+ align-items: center;+ -ms-flex-wrap: wrap;+ flex-wrap: wrap;+ -webkit-box-flex: 1;+ -ms-flex-positive: 1;+ // width: 100%;+ // padding: 0 50px;+ position: relative;+}++.dingflow-design .branch-wrap,+.dingflow-design .node-wrap {+ display: inline-flex;+ width: calc(100%);+}++.dingflow-design .branch-box-wrap {+ display: flex;+ -webkit-box-orient: vertical;+ -webkit-box-direction: normal;+ -ms-flex-direction: column;+ flex-direction: column;+ -ms-flex-wrap: wrap;+ flex-wrap: wrap;+ -webkit-box-align: center;+ -ms-flex-align: center;+ align-items: center;+ min-height: 270px;+ width: calc(100%);+ -ms-flex-negative: 0;+ flex-shrink: 0;+}++.dingflow-design .branch-box {+ display: flex;+ overflow: visible;+ min-height: 180px;+ height: auto;+ border-bottom: 1px solid #070707;+ border-top: 1px solid #070707;+ position: relative;+ margin-top: 15px;+ background-color: #f5f8ff;+}++.dingflow-design .branch-box .col-box:before {+ content: '';+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ z-index: 0;+ margin: auto;+ width: 1px;+ height: 100%;+ background-color: #070707;+}++.dingflow-design .add-branch {+ border: none;+ outline: none;+ user-select: none;+ justify-content: center;+ font-size: 12px;+ padding: 0 10px;+ height: 30px;+ line-height: 30px;+ border-radius: 15px;+ color: #4880ff;+ background: #fff;+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);+ position: absolute;+ top: -16px;+ left: 50%;+ transform: translateX(-50%);+ transform-origin: center center;+ cursor: pointer;+ z-index: 1;+ display: inline-flex;+ align-items: center;+ -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);+ transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);+}++.dingflow-design .add-branch:hover {+ transform: translateX(-50%) scale(1.1);+ box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.1);+}++.dingflow-design .add-branch:active {+ transform: translateX(-50%);+ box-shadow: none;+}++.dingflow-design .col-box {+ display: inline-flex;+ -webkit-box-orient: vertical;+ -webkit-box-direction: normal;+ flex-direction: column;+ -webkit-box-align: center;+ align-items: center;+ position: relative;+}++.dingflow-design .condition-node {+ min-height: 220px;+}++.dingflow-design .condition-node,+.dingflow-design .condition-node-box {+ display: inline-flex;+ -webkit-box-orient: vertical;+ -webkit-box-direction: normal;+ flex-direction: column;+ -webkit-box-flex: 1;+}++.dingflow-design .condition-node-box {+ padding-top: 30px;+ padding-right: 50px;+ padding-left: 50px;+ -webkit-box-pack: center;+ justify-content: center;+ -webkit-box-align: center;+ align-items: center;+ flex-grow: 1;+ position: relative;+}++.dingflow-design .condition-node-box:before {+ content: '';+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ margin: auto;+ width: 1px;+ height: 100%;+ background-color: #070707;+}++.dingflow-design .auto-judge:after {+ pointer-events: none;+ content: '';+ position: absolute;+ top: 0;+ bottom: 0;+ left: 0;+ right: 0;+ z-index: 2;+ border-radius: 4px;+ border: 1px solid transparent;+ transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);+}++.dingflow-design .auto-judge.active:after,+.dingflow-design .auto-judge:active:after,+.dingflow-design .auto-judge:hover:after {+ border: 1px solid #4880ff;+ box-shadow: 0 0 6px 0 rgba(50, 150, 250, 0.3);+}++.dingflow-design .auto-judge.active .close,+.dingflow-design .auto-judge:active .close,+.dingflow-design .auto-judge:hover .close {+ display: block;+}++.dingflow-design .auto-judge.error:after {+ border: 1px solid #f25643;+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);+}++.dingflow-design .auto-judge .title-wrapper .editable-title {+ display: inline-block;+ max-width: 250px;+ overflow: hidden;+ white-space: nowrap;+ text-overflow: ellipsis;+ font-size: 16px;+ background-color: #d88b0a;+ color: white;+}++.dingflow-design .auto-judge .title-wrapper .priority-title {+ display: inline-block;+ float: right;+ margin-right: 35px;+ color: #828282;+}++.dingflow-design .auto-judge .title-wrapper .priority-button {+ display: inline-block;+ height: 28px;+ float: right;+ margin-right: 10px;+ border: 1px solid rgba(0, 0, 0, 0.15);+ border-radius: 4px;+ color: rgba(0, 0, 0, 0.65);+}++.dingflow-design .auto-judge .title-wrapper .priority-button div {+ display: inline-block;+}++.dingflow-design .auto-judge .title-wrapper .priority-button .priority-content {+ padding: 0 8px;+ font-size: 12px;+ line-height: 28px;+ border-left: 1px solid rgba(0, 0, 0, 0.15);+ border-right: 1px solid rgba(0, 0, 0, 0.15);+}++.dingflow-design .auto-judge .placeholder {+ color: #bfbfbf;+}++.dingflow-design .auto-judge .close {+ display: none;+ position: absolute;+ right: 22px;+ top: 8px;+ width: 20px;+ height: 20px;+ font-size: 14px;+ color: rgba(0, 0, 0, 0.25);+ border-radius: 50%;+ text-align: center;+ line-height: 20px;+ z-index: 2;+}++.dingflow-design .auto-judge .content {+ // height: calc(100% - 39px);+ // display: flex;+ // align-items: center;+ // max-width: calc(100% - 36px);+ // padding: 0 18px;+ // overflow: hidden;+ // text-overflow: ellipsis;+ // font-size: 14px;+ position: relative;+ font-size: 14px;+ padding: 20px 18px;+ /* padding-right: 30px */+ text-align: center;+}++.dingflow-design .auto-judge .sort-left,+.dingflow-design .auto-judge .sort-right {+ position: absolute;+ top: 0;+ bottom: 0;+ display: none;+ z-index: 1;+ color: rgba(0, 0, 0, 0.25);+}++.dingflow-design .auto-judge .sort-left {+ left: 4px;+ top: 33px;+ color: rgba(0, 0, 0, 0.5);+}++.dingflow-design .auto-judge .sort-right {+ right: 26px;+ top: 33px;+}++.dingflow-design .auto-judge:hover .sort-left,+.dingflow-design .auto-judge:hover .sort-right {+ display: flex;+ align-items: center;+}++.dingflow-design .add-node-btn {+ user-select: none;+ width: 240px;+ padding: 30px 0;+ display: flex;+ -webkit-box-pack: center;+ justify-content: center;+ flex-shrink: 0;+ -webkit-box-flex: 1;+ flex-grow: 1;+ // margin-left: -55px;+}++.dingflow-design .add-node-btn .btn {+ outline: none;+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);+ width: 30px;+ height: 30px;+ background: #4880ff;+ border-radius: 50%;+ position: relative;+ border: none;+ line-height: 30px;+ -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);+ transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);+ // margin-left: 36px;+}++.dingflow-design .add-node-btn .btn .iconfont {+ color: #fff;+ font-size: 16px;+}++.dingflow-design .add-node-btn .btn:hover {+ transform: scale(1.3);+ box-shadow: 0 13px 27px 0 rgba(0, 0, 0, 0.1);+}++.dingflow-design .add-node-btn .btn:active {+ transform: none;+ background: #1e83e9;+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);+}++.top-left-cover-line {+ left: -1px;+}++.top-left-cover-line,+.top-right-cover-line {+ position: absolute;+ height: 3px;+ width: 50%;+ background-color: #f5f8ff;+ top: -2px;+}++.top-right-cover-line {+ right: -1px;+}++.bottom-left-cover-line {+ left: -1px;+}++.bottom-left-cover-line,+.bottom-right-cover-line {+ position: absolute;+ height: 3px;+ width: 50%;+ background-color: #f5f8ff;+ bottom: -2px;+}++.bottom-right-cover-line {+ right: -1px;+}++.node-wrap-box.active:after,+.node-wrap-box:active:after,+.node-wrap-box:hover:after {+ border: 1px solid #3296fa;+ box-shadow: 0 0 6px 0 rgba(50, 150, 250, 0.3);+}++.node-wrap-box.active .close,+.node-wrap-box:active .close,+.node-wrap-box:hover .close {+ display: block;+}++.node-wrap-box.error:after {+ border: 1px solid #f25643;+ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);+}++.node-wrap-box .title {+ position: relative;+ display: flex;+ align-items: center;+ // padding-left: 16px;+ // padding-right: 30px;+ // width: 100%;+ height: 40px;+ line-height: 40px;+ font-size: 16px;+ color: #fff;+ text-align: center;+ background: #0687a5;+ border-radius: 4px 4px 0 0;+}++.node-wrap-box .title .iconfont {+ font-size: 12px;+ margin-right: 5px;+}++.node-wrap-box .placeholder {+ color: #bfbfbf;+}++.node-wrap-box .close {+ display: none;+ position: absolute;+ right: 10px;+ top: 50%;+ transform: translateY(-50%);+ width: 20px;+ height: 20px;+ font-size: 14px;+ color: #fff;+ border-radius: 50%;+ text-align: center;+ line-height: 20px;+}++.node-wrap-box .content {+ position: relative;+ font-size: 14px;+ padding: 20px 18px;+ /* padding-right: 30px */+ text-align: center;+}++.node-wrap-box .content .text {+ overflow: hidden;+ text-overflow: ellipsis;+ display: -webkit-box;+ -webkit-line-clamp: 3;+ -webkit-box-orient: vertical;+}++.node-wrap-box .content .arrow {+ position: absolute;+ right: 10px;+ top: 50%;+ transform: translateY(-50%);+ width: 20px;+ height: 14px;+ font-size: 14px;+ color: #979797;+}++.start-node.node-wrap-box .content .text {+ display: block;+ white-space: nowrap;+}+</style>diff --git a/frontend/src/components/form/v-datetime-picker.vue b/frontend/src/components/form/v-datetime-picker.vuenew file mode 100644index 0000000..f6e2708--- /dev/null+++ b/frontend/src/components/form/v-datetime-picker.vue@@ -0,0 +1,74 @@+<template>+ <div class="pickerContainer">+ <v-text-field+ v-model="textVal"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="props.label"+ variant="solo"+ :readonly="data.readOnly"+ :persistent-clear="props.disabled ? false : true"+ :disabled="props.disabled"+ >+ </v-text-field>+ <div class="handleClickBlock">+ <vxe-input v-model="textVal" type="datetime" transfer></vxe-input>+ </div>+ </div>+</template>++<script setup lang="tsx">+import { reactive, computed } from 'vue'++const emit = defineEmits(['update:modelValue'])++const props = defineProps<{+ label: string+ disabled?: boolean+ modelValue: string+}>()++const data = reactive({+ val1: '',+ readOnly: true+})++const textVal = computed({+ get: () => props.modelValue,+ set: (val: string) => {+ emit('update:modelValue', val)+ }+})+</script>++<style scoped lang="less">+.vxe-input {+ opacity: 0 !important;+ height: 50px;+ width: 100% !important;+}+:deep(.vxe-input--inner) {+ border: none !important;+ padding-right: 0 !important;+ // width: calc(100% - 36px) !important;+}++:deep(.vxe-input--extra-suffix) {+ display: none !important;+}++.pickerContainer {+ position: relative;+ // display: inline-block;+ width: 100%;+}+.handleClickBlock {+ position: absolute;+ top: 0px;+ left: 20px;+ width: calc(100% - 36px - 20px - 10px) !important;+ height: 100%;+}+</style>diff --git a/frontend/src/components/hiprint/hiprint.vue b/frontend/src/components/hiprint/hiprint.vuenew file mode 100644index 0000000..19b2f99--- /dev/null+++ b/frontend/src/components/hiprint/hiprint.vue@@ -0,0 +1,540 @@+<template>+ <v-dialog v-model="data.formVisible" fullscreen :scrim="false" transition="dialog-bottom-transition">+ <v-card>+ <div style="padding: 15px 15px">+ <v-row>+ <v-col cols="2">+ <div class="left-top-box">+ <v-select+ v-model="data.mode"+ :items="data.modeList"+ density="compact"+ hide-details+ clearable+ @update:model-value="method.handleChangeMode"+ ></v-select>+ </div>++ <div class="left-box">+ <div id="hiprintEpContainer" class="rect-printElement-types hiprintEpContainer"> </div>+ </div>+ </v-col>+ <v-col cols="7">+ <div class="center-btn-box">+ <div>+ <v-btn+ v-for="(value, type) in data.paperTypes"+ :key="type"+ :color="curPaperType === type ? 'indigo-darken-3' : 'white'"+ @click="method.handleSetPaper(type, value)"+ >+ {{ type }}+ </v-btn>+ <v-btn+ icon="mdi-magnify-minus-outline"+ style="font-size: 14px; margin-left: 10px"+ size="small"+ @click="method.handleChangeScale(false)"+ ></v-btn>+ <v-btn disabled size="small" style="margin-left: 10px; width: 70px">{{ scaleValueStr }}%</v-btn>+ <v-btn+ icon="mdi-magnify-plus-outline"+ style="font-size: 14px; margin-left: 10px"+ size="small"+ @click="method.handleChangeScale(true)"+ ></v-btn>+ </div>+ <div>+ <v-btn style="font-size: 14px; margin-left: 10px" @click="method.handlePreView()">+ {{+ $t('system.page.preView') }}+ </v-btn>+ </div>+ </div>++ <div class="center-box card-design">+ <div id="hiprint-printTemplate" style="margin-top: 20px" class="hiprint-printTemplate"></div>+ </div>+ </v-col>+ <v-col cols="3">+ <div class="right-top-box">+ <v-btn icon style="font-size: 14px; margin-left: 10px" size="small" @click="data.formVisible = false">+ <v-icon>mdi-close</v-icon>+ </v-btn>+ </div>++ <div class="right-box">+ <div id="PrintElementOptionSetting"></div>+ </div>+ </v-col>+ </v-row>+ </div>+ </v-card>+ <preViewDialog ref="preViewDialogRef" />+ </v-dialog>+</template>+<script lang="ts" setup>+import { reactive, ref, computed, watch, nextTick, getCurrentInstance, ComponentInternalInstance } from 'vue'+import { useRouter } from 'vue-router'+import { listByPath } from '@/api/base/printSolution'+import { PrintSolutionVO, PrintSolutionGetByPathVo } from '@/types/Base/PrintSolution'+import i18n from '@/languages/i18n'+import preViewDialog from './preView.vue'+import { PRINT_MENU } from '@/constant/print'++const { appContext } = getCurrentInstance() as ComponentInternalInstance+const proxy = appContext.config.globalProperties+const { hiprint } = proxy+interface paperTypeData {+ width: number+ height: number+}+interface tableInterFace {+ name: string+ field: string+ columns: Array<string>+}+const props = defineProps<{+ form: object+ tabPage: string+}>()+const preViewDialogRef = ref()+const routerInfo = useRouter()+const data = reactive({+ formVisible: false,+ hiprintTemplate: {} as any,+ mode: '',+ modeList: [] as string[],+ table: [] as tableInterFace[],+ pageForm: {} as any,+ i18nName: '' as string,+ // 当前纸张+ curPaper: {+ type: 'A4',+ width: 210,+ height: 296.6+ },+ // 纸张类型+ paperTypes: {+ A3: {+ width: 420,+ height: 296.6+ },+ A4: {+ width: 210,+ height: 296.6+ },+ A5: {+ width: 210,+ height: 147.6+ },+ B3: {+ width: 500,+ height: 352.6+ },+ B4: {+ width: 250,+ height: 352.6+ },+ B5: {+ width: 250,+ height: 175.6+ }+ },+ scaleValue: 1,+ scaleMax: 5,+ scaleMin: 0.5,+ panel: {},+ printSolutionList: [] as PrintSolutionVO[]+})+const method = reactive({+ initSetting() {+ data.table = []+ data.i18nName = ''+ data.pageForm = {}+ const option_path = PRINT_MENU.filter(item => item.vue_path === vuePath.value)+ if (option_path.length > 0) {+ data.i18nName = option_path[0].i18nName+ const children = option_path[0].children as any[]+ const option_page = children.find(item => item.tab_page === props.tabPage)+ if (option_page) {+ data.pageForm = option_page.form+ for (const key in data.pageForm) {+ if (key.indexOf('detailList') > -1) {+ const detailList = data.pageForm[key]+ let name = ''+ if (detailList.name === vuePath.value) {+ name = i18n.global.t('base.printSolution.detailList')+ } else {+ name = i18n.global.t(`${ data.i18nName }.${ detailList.name }`)+ }+ data.table.push({ name, field: key, columns: detailList.columns })+ }+ }+ }+ }+ },+ provider() {+ const elementList = [+ new hiprint.PrintElementTypeGroup(i18n.global.t('system.hiprint.routine'), [+ {+ tid: 'providerModule.customText',+ title: i18n.global.t('system.hiprint.text'),+ customText: i18n.global.t('system.hiprint.text'),+ custom: true,+ type: 'text'+ },+ { tid: 'providerModule.image', title: 'Logo', data: '', custom: true, type: 'image' }+ ])+ ]+ const userList = [] as any[]+ for (const key in data.pageForm) {+ const i18nName = `${ data.i18nName }.${ key }`+ const labelName = i18n.global.t(i18nName)+ if (labelName !== i18nName && !key.includes('detailList')) {+ userList.push({+ tid: `providerModule.${ key }`,+ title: labelName,+ data: labelName,+ type: 'text',+ options: {+ field: key,+ testData: labelName,+ height: 16,+ fontSize: 6.75,+ fontWeight: '700',+ textAlign: 'left',+ textContentVerticalAlign: 'middle'+ }+ })+ }+ }+ let index = 1+ data.table.forEach((item) => {+ const object = {+ tid: `providerModule.table${ index.toString() }`,+ title: item.name,+ type: 'table',+ options: {+ field: item.field,+ fields: [{ text: '名称', field: 'NAME' }]+ },+ editable: true,+ columnDisplayEditable: true, // 列显示是否能编辑+ columnDisplayIndexEditable: true, // 列顺序显示是否能编辑+ columnTitleEditable: true, // 列标题是否能编辑+ columnResizable: true, // 列宽是否能调整+ columnAlignEditable: true, // 列对齐是否调整+ columns: [[{ title: '部门', align: 'center', field: 'dept', width: 50 }]]+ }+ object.columns[0] = []+ object.options.fields = []+ item.columns.forEach((col) => {+ const i18nName = `${ data.i18nName }.${ col }`+ const labelName = i18n.global.t(i18nName)+ if (i18nName !== labelName) {+ object.columns[0].push({ title: labelName, align: 'center', field: col, width: 50 })+ object.options.fields.push({ text: labelName, field: col })+ }+ })+ userList.push(object)+ index += 1+ })+ if (userList.length > 0) {+ elementList.push(new hiprint.PrintElementTypeGroup(i18n.global.t('system.hiprint.field'), userList))+ }+ elementList.push(+ new hiprint.PrintElementTypeGroup(i18n.global.t('system.hiprint.auxiliary'), [+ {+ tid: 'providerModule.hline',+ title: i18n.global.t('system.hiprint.hline'),+ type: 'hline'+ },+ {+ tid: 'providerModule.vline',+ title: i18n.global.t('system.hiprint.vline'),+ type: 'vline'+ },+ {+ tid: 'providerModule.rect',+ title: i18n.global.t('system.hiprint.rect'),+ type: 'rect'+ },+ {+ tid: 'providerModule.oval',+ title: i18n.global.t('system.hiprint.oval'),+ type: 'oval'+ }+ ])+ )+ const addElementTypes = function (context: any) {+ context.removePrintElementTypes('providerModule')+ context.addPrintElementTypes('providerModule', elementList)+ }+ return {+ addElementTypes+ }+ },+ initProvier() {+ hiprint.init({+ providers: [method.provider()]+ })+ // $('.hiprintEpContainer').empty()+ const dom = document.getElementById('hiprintEpContainer')+ if (dom !== null) {+ dom.innerHTML = ''+ }+ hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'providerModule')+ },+ initTemplate() {+ // const provider = providers[0]+ // $('#hiprint-printTemplate').empty()+ const dom = document.getElementById('hiprint-printTemplate')+ if (dom !== null) {+ dom.innerHTML = ''+ }+ data.hiprintTemplate = new hiprint.PrintTemplate({+ template: data.panel,+ dataMode: 1, // 1:getJson 其他:getJsonTid 默认1+ history: false, // 是否需要 撤销重做功能+ // onDataChanged: (type, json) => {+ // console.log(type) // 新增、移动、删除、修改(参数调整)、大小、旋转+ // console.log(json) // 返回 template+ // // 更新模板+ // // hiprintTemplate.update(json)+ // // console.log(hiprintTemplate.historyList)+ // },+ onImageChooseClick: (target) => {+ // 创建input,模拟点击,然后 target.refresh 更新+ const input = document.createElement('input')+ input.setAttribute('type', 'file')+ input.click()+ input.onchange = function (evnt: any) {+ const file = evnt?.target?.files[0]+ if (file) {+ const reader = new FileReader()+ // 通过文件流行文件转换成Base64字行串+ reader.readAsDataURL(file)+ // 转换成功后+ reader.onloadend = function () {+ // 通过 target.refresh 更新图片元素+ target.refresh(reader.result)+ }+ }+ }+ input.remove()+ },+ settingContainer: '#PrintElementOptionSetting',+ paginationContainer: '.hiprint-printPagination'+ })+ data.hiprintTemplate.design('#hiprint-printTemplate')+ },+ async init() {+ const form = {+ vue_path: vuePath.value,+ tab_page: props.tabPage+ } as PrintSolutionGetByPathVo+ const { data: res } = await listByPath(form)+ if (res.isSuccess) {+ data.printSolutionList = res.data+ data.modeList = data.printSolutionList.map((item) => item.solution_name)+ }+ if (!data.mode && data.modeList.length > 0) {+ data.mode = data.printSolutionList[0].solution_name+ }+ method.handleChangeMode()+ },+ handleSetPaper(type: string, value: paperTypeData) {+ try {+ if (Object.keys(data.paperTypes).includes(type)) {+ data.curPaper = { type, width: value.width, height: value.height }+ } else {+ data.curPaper = { type: 'other', width: value.width, height: value.height }+ }+ data.hiprintTemplate.setPaper(value.width, value.height)+ } catch (error) {+ // console.log(error)+ }+ },+ handleChangeScale(big: boolean) {+ let scaleValue = data.scaleValue+ if (big) {+ scaleValue += 0.1+ if (scaleValue > data.scaleMax) scaleValue = 5+ } else {+ scaleValue -= 0.1+ if (scaleValue < data.scaleMin) scaleValue = 0.5+ }+ scaleValue = Number(scaleValue.toFixed(1))+ if (data.hiprintTemplate) {+ // scaleValue: 放大缩小值, false: 不保存(不传也一样), 如果传 true, 打印时也会放大+ data.hiprintTemplate.zoom(scaleValue, true)+ data.scaleValue = scaleValue+ }+ },+ handleChangeMode() {+ const option = data.printSolutionList.filter((item) => item.solution_name === data.mode)+ if (option.length > 0) {+ data.panel = JSON.parse(option[0].config_json)+ data.curPaper = {+ type: option[0].report_direction,+ width: option[0].report_width,+ height: option[0].report_length+ }+ } else {+ data.panel = {}+ }+ method.initTemplate()+ },+ handlePreView() {+ const ref = preViewDialogRef.value+ ref.data.width = data.curPaper.width+ ref.data.hiprintTemplate = data.hiprintTemplate+ ref.data.printData = props.form+ ref.method.show()+ },+})++watch(+ () => data.formVisible,+ (val) => {+ if (val) {+ nextTick(() => {+ method.initSetting()+ method.initProvier()+ method.init()+ })+ }+ }+)+const scaleValueStr = computed(() => {+ let scaleValue = data.scaleValue * 100+ scaleValue = Number(scaleValue.toFixed(0))+ return scaleValue+})+const curPaperType = computed(() => {+ let type = 'other'+ const types = data.paperTypes+ for (const key in types) {+ const item = types[key]+ const { width, height } = data.curPaper+ if (item.width === width && item.height === height) {+ type = key+ }+ }+ return type+})+const vuePath = computed(() => {+ const vuePath = routerInfo.currentRoute.value.name?.toString() as string+ return vuePath+})++defineExpose({+ data+})+</script>+<style scoped lang="less">+.center-btn-box {+ margin-bottom: 5px;+ display: flex;+ justify-content: space-between;+}++.center-box {+ height: calc(100vh - 83px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+}++.left-top-box {+ display: flex;+ justify-content: space-between;+ /* 水平居中对齐 */+}++.left-box {+ height: calc(100vh - 83px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+ margin-top: 5px;+}++.right-top-box {+ display: flex;+ justify-content: flex-end;+}++.right-box {+ height: calc(100vh - 83px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+ margin-top: 5px;+}++.hiprintEpContainer {+ max-width: 200px;+}++:deep(.hiprint-printElement-type > li > ul > li > a) {+ padding: 4px 4px !important;+ color: white !important;+ background-color: #9c27b0 !important;+ font-family: 'Roboto', sans-serif !important;+ font-weight: 500 !important;+ line-height: normal !important;+ vertical-align: middle !important;+ justify-content: center !important;+ height: 30px !important;+ border-radius: 4px !important;+ border-style: none !important;+ text-overflow: ellipsis !important;+ font-size: 14px !important;+ box-shadow: 0 3px 1px -2px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, 0.2)),+ 0 2px 2px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.14)), 0 1px 5px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.12)) !important;+}++:deep(.hiprint-printElement-type > li > .title) {+ color: #000000de !important;+ font-family: 'Roboto', sans-serif !important;+ font-weight: 500 !important;+}++// 最右边样式,确认按钮背景色+:deep(.hiprint-option-item-settingBtn) {+ background: #9c27b0 !important;+}++// 最右边样式,删除按钮背景色+:deep(.hiprint-option-item-deleteBtn) {+ background: #8d9098 !important;+}++// 默认图片+// :deep(.hiprint-printElement-image-content) {+// img {+// content: url('@/assets/img/webLogoMini.png') !important;+// }+// }++// 设计容器+.card-design {+ overflow: hidden;+ overflow-x: auto;+ overflow-y: auto;+}+</style>\ No newline at end of filediff --git a/frontend/src/components/hiprint/hiprintFast.vue b/frontend/src/components/hiprint/hiprintFast.vuenew file mode 100644index 0000000..9fc8425--- /dev/null+++ b/frontend/src/components/hiprint/hiprintFast.vue@@ -0,0 +1,235 @@+<template>+ <v-dialog v-model="data.formVisible" width="260px">+ <v-card>+ <div style="padding: 5px 15px">+ <v-row>+ <v-col cols="12">+ <div class="left-top-box">+ <v-select+ v-model="data.mode"+ :items="data.modeList"+ density="compact"+ hide-details+ clearable+ @update:model-value="method.handleChangeMode"+ ></v-select>+ </div>+ </v-col>+ </v-row>+ <!-- <v-row v-show="false">+ <v-col cols="12">+ <div class="center-box card-design">+ <div id="hiprint-printTemplate" style="margin-top: 20px" class="hiprint-printTemplate"></div>+ </div>+ </v-col>+ </v-row> -->+ </div>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.handleClose">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.handlePrint">{{ $t('system.page.print') }}</v-btn>+ </v-card-actions>+ </v-card>+ </v-dialog>+</template>+<script lang="ts" setup>+import { reactive, computed, watch, nextTick, getCurrentInstance, ComponentInternalInstance } from 'vue'+import { useRouter } from 'vue-router'+import i18n from '@/languages/i18n'+import { listByPath } from '@/api/base/printSolution'+import { PrintSolutionVO, PrintSolutionGetByPathVo } from '@/types/Base/PrintSolution'+import { hookComponent } from '@/components/system/index'++const { appContext } = getCurrentInstance() as ComponentInternalInstance+const proxy = appContext.config.globalProperties+const { hiprint } = proxy+const props = defineProps<{+ form: object+ tabPage: string+}>()+const routerInfo = useRouter()+const data = reactive({+ formVisible: false,+ hiprintTemplate: {} as any,+ mode: '',+ modeList: [] as string[],+ panel: {},+ printSolutionList: [] as PrintSolutionVO[]+})+const method = reactive({+ initTemplate() {+ const dom = document.getElementById('hiprint-printTemplate')+ if (dom !== null) {+ dom.innerHTML = ''+ }+ data.hiprintTemplate = new hiprint.PrintTemplate({+ template: data.panel,+ dataMode: 1, // 1:getJson 其他:getJsonTid 默认1+ history: false, // 是否需要 撤销重做功能+ // settingContainer: '#PrintElementOptionSetting',+ // paginationContainer: '.hiprint-printPagination'+ })+ // data.hiprintTemplate.design('#hiprint-printTemplate')+ if (data.modeList.length === 1) {+ method.handlePrint()+ } else {+ data.formVisible = true+ }+ },+ async init() {+ const form = {+ vue_path: vuePath.value,+ tab_page: props.tabPage+ } as PrintSolutionGetByPathVo+ const { data: res } = await listByPath(form)+ if (res.isSuccess) {+ data.printSolutionList = res.data+ data.modeList = data.printSolutionList.map((item) => item.solution_name)+ }+ if (!data.mode && data.modeList.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.hiprint.emptyScheme') }`+ })+ method.handleClose()+ } else {+ data.mode = data.printSolutionList[0].solution_name+ method.handleChangeMode()+ }+ },+ handleChangeMode() {+ const option = data.printSolutionList.filter((item) => item.solution_name === data.mode)+ if (option.length > 0) {+ data.panel = JSON.parse(option[0].config_json)+ } else {+ data.panel = {}+ }+ method.initTemplate()+ },+ handleClose() {+ data.formVisible = false+ },+ handleOpen() {+ method.init()+ },+ handlePrint() {+ data.hiprintTemplate.print(+ props.form,+ {},+ {+ callback: () => {+ // data.waitShowPrinter = false+ }+ }+ )+ }+})+const vuePath = computed(() => {+ const vuePath = routerInfo.currentRoute.value.name?.toString() as string+ return vuePath+})++defineExpose({+ method+})+</script>+<style scoped lang="less">+.center-btn-box {+ margin-bottom: 5px;+ display: flex;+ justify-content: space-between;+}++.center-box {+ height: calc(100vh - 83px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+}++.left-top-box {+ display: flex;+ justify-content: space-between;+ /* 水平居中对齐 */+}++.left-box {+ height: calc(100vh - 83px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+ margin-top: 5px;+}++.right-top-box {+ display: flex;+ justify-content: flex-end;+}++.right-box {+ height: calc(100vh - 83px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+ margin-top: 5px;+}++:deep(.hiprint-printElement-type > li > ul > li > a) {+ padding: 4px 4px !important;+ color: white !important;+ background-color: #9c27b0 !important;+ font-family: 'Roboto', sans-serif !important;+ font-weight: 500 !important;+ line-height: normal !important;+ vertical-align: middle !important;+ justify-content: center !important;+ height: 30px !important;+ border-radius: 4px !important;+ border-style: none !important;+ text-overflow: ellipsis !important;+ font-size: 14px !important;+ box-shadow: 0 3px 1px -2px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, 0.2)),+ 0 2px 2px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.14)), 0 1px 5px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.12)) !important;+}++:deep(.hiprint-printElement-type > li > .title) {+ color: #000000de !important;+ font-family: 'Roboto', sans-serif !important;+ font-weight: 500 !important;+}++// 最右边样式,确认按钮背景色+:deep(.hiprint-option-item-settingBtn) {+ background: #9c27b0 !important;+}++// 最右边样式,删除按钮背景色+:deep(.hiprint-option-item-deleteBtn) {+ background: #8d9098 !important;+}++// 默认图片+// :deep(.hiprint-printElement-image-content) {+// img {+// content: url('@/assets/img/webLogoMini.png') !important;+// }+// }++// 设计容器+.card-design {+ overflow: hidden;+ overflow-x: auto;+ overflow-y: auto;+}+</style>diff --git a/frontend/src/components/hiprint/preView.vue b/frontend/src/components/hiprint/preView.vuenew file mode 100644index 0000000..e296d0f--- /dev/null+++ b/frontend/src/components/hiprint/preView.vue@@ -0,0 +1,76 @@+<template>+ <v-dialog v-model="data.formVisible" :width="contentWidth" height="90%">+ <v-card>+ <v-toolbar color="white">+ <v-toolbar-title>{{ $t('system.page.preView') }}</v-toolbar-title>+ <v-spacer></v-spacer>+ <v-btn color="primary" variant="text" @click="method.print">{{ $t('system.page.print') }}</v-btn>+ <v-btn variant="text" @click="method.hideModal">{{ $t('system.page.close') }}</v-btn>+ </v-toolbar>+ <div class="preview_box">+ <v-row>+ <v-col cols="12">+ <div id="preview_content_custom" class="preview_content"></div>+ </v-col>+ </v-row>+ </div>+ </v-card>+ </v-dialog>+</template>+<script lang="ts" setup>+import { reactive, computed } from 'vue'+import $ from 'jquery'++const data = reactive({+ formVisible: false,+ waitShowPrinter: false,+ // 纸张宽 mm+ width: 0,+ // 模板+ hiprintTemplate: {} as any,+ hiprintData: {} as any,+ // 数据+ printData: {}+})+const method = reactive({+ hideModal() {+ data.formVisible = false+ },+ show() {+ data.formVisible = true+ setTimeout(() => {+ $('#preview_content_custom').html(data.hiprintTemplate.getHtml(data.printData))+ }, 500)+ },+ print() {+ data.waitShowPrinter = true+ data.hiprintTemplate.print(+ data.printData,+ {},+ {+ callback: () => {+ data.waitShowPrinter = false+ }+ }+ )+ }+})+const contentWidth = computed(() => {+ let cwidth = (data.width * 3.78) as number+ cwidth += 25+ return `${ cwidth }px`+})+defineExpose({+ data,+ method+})+</script>+<style scoped lang="less">+.preview_box {+ display: flex;+ justify-content: center; /* 水平居中对齐 */+ border: 1px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+}+</style>diff --git a/frontend/src/components/login/login-form.vue b/frontend/src/components/login/login-form.vueindex 6a75a8f..096de8c 100644--- a/frontend/src/components/login/login-form.vue+++ b/frontend/src/components/login/login-form.vue@@ -99,7 +99,21 @@ const method = reactive({})return}- store.commit('user/setUserMenuList', authorityRes.data)++ const authorityList = authorityRes.data++ // test+ // authorityList.push({+ // id: 112999,+ // menu_name: 'test',+ // module: 'baseModule',+ // vue_path: 'test',+ // vue_path_detail: '',+ // vue_directory: 'test/test',+ // sort: 2+ // })++ store.commit('user/setUserMenuList', authorityList)hookComponent.$message({type: 'success',diff --git a/frontend/src/components/select/commodity-select.vue b/frontend/src/components/select/commodity-select.vueindex cc20cff..7870491 100644--- a/frontend/src/components/select/commodity-select.vue+++ b/frontend/src/components/select/commodity-select.vue@@ -71,6 +71,7 @@<vxe-column field="spu_name" :title="$t('base.commodityManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('base.commodityManagement.sku_code')"></vxe-column><vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="qty_available" :title="$t('wms.stock.qty_available')"></vxe-column></vxe-table><custom-pagerdiff --git a/frontend/src/components/select/employee-select.vue b/frontend/src/components/select/employee-select.vuenew file mode 100644index 0000000..525b417--- /dev/null+++ b/frontend/src/components/select/employee-select.vue@@ -0,0 +1,230 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="data.showDialog" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.userManagement.userModalTitle')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="searchForm" :style="{ height: searchFormHeight }">+ <tooltip-btn icon="mdi-refresh" size="x-small" :tooltip-text="$t('system.page.reset')" @click="method.resetForm"></tooltip-btn>+ <tooltip-btn icon="mdi-magnify" size="x-small" :tooltip-text="$t('system.page.confirm')" @click="method.sureSearch"></tooltip-btn>+ <v-form ref="formRef" class="mt-4">+ <v-text-field+ v-model="data.searchForm.user_num"+ :label="$t('base.userManagement.user_num')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ <v-text-field+ v-model="data.searchForm.user_name"+ :label="$t('base.userManagement.user_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ <v-text-field+ v-model="data.searchForm.user_role"+ :label="$t('base.userManagement.user_role')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="user_num" :title="$t('base.userManagement.user_num')"></vxe-column>+ <vxe-column field="user_name" :title="$t('base.userManagement.user_name')"></vxe-column>+ <vxe-column field="user_role" :title="$t('base.userManagement.user_role')"></vxe-column>+ <vxe-column field="sex" :title="$t('base.userManagement.sex')">+ <template #default="{ row }">+ <span>{{ $t(`system.combobox.sex.${row.sex}`) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.userManagement.contact_tel')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.userManagement.is_valid')">+ <template #default="{ row, column }">+ <span>{{ row[column.property] ? $t('system.combobox.yesOrNo.yes') : $t('system.combobox.yesOrNo.no') }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.confirm') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+/**+ * @description Select Modal+ * @example+ * <xxx-select :show-dialog="data.showDialogSelect" @close="method.closeDialogSelect" @sureSelect="method.sureSelect" />+ *+ * openSelect: () => {+ data.showDialogSelect = true+ },+ closeDialogSelect: () => {+ data.showDialogSelect = false+ },+ */+import { reactive, computed, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { hookComponent } from '@/components/system/index'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { SearchObject } from '@/types/System/Form'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT } from '@/constant/style'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import i18n from '@/languages/i18n'+import { getUserList } from '@/api/base/userManagement'++const emit = defineEmits(['sureSelect'])+const xTable = ref()++const data = reactive({+ showDialog: false as boolean,+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ user_num: '',+ user_name: '',+ user_role: ''+ },+ timer: ref<any>(null)+})++const method = reactive({+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getList()+ }),++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getList()+ },++ getList: async () => {+ const { data: res } = await getUserList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ resetForm: () => {+ // Clear search input+ for (const key in data.searchForm) {+ const str = key as string+ data.searchForm[str as keyof typeof data.searchForm] = ''+ }++ // Clear search params+ data.tablePage.searchObjects = []+ },++ submit: () => {+ const checkRecords = xTable.value.getCheckboxRecords()+ emit('sureSelect', checkRecords)+ method.closeDialog()+ },++ openDialog: () => {+ method.getList()++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.searchForm {+ border: 1px solid #eee;+ box-sizing: border-box;+ padding: 20px;+ overflow: auto;+}+</style>diff --git a/frontend/src/components/select/warehouse-select.vue b/frontend/src/components/select/warehouse-select.vuenew file mode 100644index 0000000..bc5c453--- /dev/null+++ b/frontend/src/components/select/warehouse-select.vue@@ -0,0 +1,230 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="data.showDialog" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.warehourseSelectModal')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="searchForm" :style="{ height: searchFormHeight }">+ <tooltip-btn icon="mdi-refresh" size="x-small" :tooltip-text="$t('system.page.reset')" @click="method.resetForm"></tooltip-btn>+ <tooltip-btn icon="mdi-magnify" size="x-small" :tooltip-text="$t('system.page.confirm')" @click="method.sureSearch"></tooltip-btn>+ <v-form ref="formRef" class="mt-4">+ <v-text-field+ v-model="data.searchForm.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ <v-text-field+ v-model="data.searchForm.city"+ :label="$t('base.warehouseSetting.city')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ <v-text-field+ v-model="data.searchForm.manager"+ :label="$t('base.warehouseSetting.manager')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.warehouseSetting.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.warehouseSetting.address')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.warehouseSetting.contact_tel')"></vxe-column>+ <vxe-column field="email" :title="$t('base.warehouseSetting.email')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.warehouseSetting.manager')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.warehouseSetting.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :title="$t('base.warehouseSetting.create_time')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-col>+ </v-row>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.confirm') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+/**+ * @description Select Modal+ * @example+ * <xxx-select :show-dialog="data.showDialogSelect" @close="method.closeDialogSelect" @sureSelect="method.sureSelect" />+ *+ * openSelect: () => {+ data.showDialogSelect = true+ },+ closeDialogSelect: () => {+ data.showDialogSelect = false+ },+ */+import { reactive, computed, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { hookComponent } from '@/components/system/index'+import { getWarehouseList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { formatIsValid } from '@/utils/format/formatSystem'+import { SearchObject } from '@/types/System/Form'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT } from '@/constant/style'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject } from '@/utils/common'+import customPager from '@/components/custom-pager.vue'+import i18n from '@/languages/i18n'++const emit = defineEmits(['sureSelect'])+const xTable = ref()++const data = reactive({+ showDialog: false as boolean,+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ warehouse_name: '',+ city: '',+ manager: ''+ },+ timer: ref<any>(null)+})++const method = reactive({+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getList()+ }),++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getList()+ },++ getList: async () => {+ const { data: res } = await getWarehouseList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ resetForm: () => {+ // Clear search input+ for (const key in data.searchForm) {+ const str = key as string+ data.searchForm[str as keyof typeof data.searchForm] = ''+ }++ // Clear search params+ data.tablePage.searchObjects = []+ },++ submit: () => {+ const checkRecords = xTable.value.getCheckboxRecords()+ emit('sureSelect', checkRecords)+ method.closeDialog()+ },++ openDialog: () => {+ method.getList()++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.searchForm {+ border: 1px solid #eee;+ box-sizing: border-box;+ padding: 20px;+ overflow: auto;+}+</style>diff --git a/frontend/src/components/system/btnGroup.vue b/frontend/src/components/system/btnGroup.vuenew file mode 100644index 0000000..311fd8f--- /dev/null+++ b/frontend/src/components/system/btnGroup.vue@@ -0,0 +1,36 @@+<template>+ <div class="btn-group col">+ <tooltip-btn+ v-for="(bItem, index) of btnList"+ :key="index"+ :disabled="Boolean(bItem.code) && !authorityList.includes(bItem.code)"+ :icon="bItem.icon"+ :tooltip-text="bItem.name"+ @click="bItem.click"+ ></tooltip-btn>+ </div>+</template>++<script setup lang="tsx">+// import { onMounted, reactive } from 'vue'+import tooltipBtn from '@/components/tooltip-btn.vue'++interface BtnItem {+ name: string+ icon: string+ code: string // Reserved for permission control+ click: () => void+}++defineProps<{+ btnList: BtnItem[]+ authorityList: string[]+}>()+</script>++<style scoped lang="less">+.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/components/system/languages.vue b/frontend/src/components/system/languages.vueindex e5bd8be..e375498 100644--- a/frontend/src/components/system/languages.vue+++ b/frontend/src/components/system/languages.vue@@ -2,8 +2,8 @@<div class="languageIcon"><v-menu><template #activator="{ props }">- <v-icon icon="mdi-translate" color="#666666" v-bind="props"></v-icon>- <!-- <v-icon icon="mdi-web" color="#666666" v-bind="props"></v-icon> -->+ <!-- <v-icon icon="mdi-translate" color="#666666" v-bind="props"></v-icon> -->+ <v-icon icon="mdi-web" color="#666666" v-bind="props"></v-icon></template><v-list><v-list-item v-for="(item, index) in data.languageList" :key="index" :value="index" @click="method.changeLanguage(item.value)">@@ -18,7 +18,7 @@import { reactive } from 'vue'import { useI18n } from 'vue-i18n'import { useLocale } from 'vuetify'-import { getSelcectedLang } from '@/languages/method/index'+import { getSelectedLang } from '@/languages/method/index'import { getSelcectedLangForVuetify } from '@/plugins/vuetify/method/index'import { store } from '@/store'import { router } from '@/router'@@ -30,6 +30,7 @@ const data = reactive({showLanguage: false,languageList: [{ title: '简体中文', value: 'zh' },+ { title: '繁體中文', value: 'tw' },{ title: 'English', value: 'en' }]})@@ -41,7 +42,7 @@ const method = reactive({}localStorage.setItem('language', lang)store.commit('system/setLanguage', lang) // set store- locale.value = getSelcectedLang(lang) // global+ locale.value = getSelectedLang(lang) // globalcurrent.value = getSelcectedLangForVuetify(lang) // vuetifyif (!['/', '/login'].includes(router.currentRoute.value.path)) {diff --git a/frontend/src/components/system/search-group.vue b/frontend/src/components/system/search-group.vuenew file mode 100644index 0000000..742a7b8--- /dev/null+++ b/frontend/src/components/system/search-group.vue@@ -0,0 +1,94 @@+<template>+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col v-if="[1].includes(searchSetting.length)" cols="4"> </v-col>+ <v-col v-if="[1, 2].includes(searchSetting.length)" cols="4"> </v-col>+ <v-col v-for="(item, index) of searchSetting" :key="index" cols="4">+ <template v-if="item.type === 'string'">+ <v-text-field+ v-model="searchForm[item.name]"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t(`${props.i18nPrefix}.${item.name}`)"+ variant="solo"+ >+ </v-text-field>+ </template>+ <template v-else-if="item.type === 'datetime'">+ <v-datetime-picker v-model="searchForm[item.name]" :label="$t(`${props.i18nPrefix}.${item.name}`)" />+ </template>+ </v-col>+ </v-row>++ <set-search ref="SetSearchRef" :i18n-key="props.i18nPrefix" :options="data.searchSetting" @success="method.refreshSearchSetting()" />+</template>++<script setup lang="tsx">+import { reactive, computed, ref, onMounted } from 'vue'+import { getMenuSearchSetting } from '@/utils/common'+import vDatetimePicker from '../form/v-datetime-picker.vue'+import searchSettingSet from '@/constant/searchSettingSet'+import SetSearch from '@/components/system/set-search.vue'++const SetSearchRef = ref()++const emit = defineEmits(['sureSearch', 'update:modelValue'])++const props = defineProps<{+ modelValue: any+ // searchSetting: any[]+ menuName: string+ i18nPrefix: string+}>()++const data = reactive({+ searchSetting: [] as string[],+ initForm: null+})++const method = reactive({+ sureSearch: () => {+ emit('sureSearch')+ },+ // 刷新查询条件+ refreshSearchSetting: () => {+ // 不加ref不会触发响应式+ searchForm.value = ref(JSON.parse(JSON.stringify(data.initForm)))++ // Obtain query condition settings+ const searchSetting = getMenuSearchSetting(props.menuName)+ if (searchSetting.length > 0) {+ data.searchSetting = searchSetting+ } else {+ data.searchSetting = searchSettingSet[props.menuName].default+ }+ }+})++onMounted(() => {+ data.initForm = JSON.parse(JSON.stringify(props.modelValue))++ method.refreshSearchSetting()+})++const searchForm = computed({+ get: () => props.modelValue,+ set: (val: any) => {+ emit('update:modelValue', val)+ }+})++const searchSetting = computed(() => {+ const result = searchSettingSet[props.menuName].list.filter((item: any) => data.searchSetting.includes(item.name))+ return result+})++defineExpose({+ openDialog: () => {+ SetSearchRef.value.openDialog(props.menuName)+ }+})+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/components/system/set-search.vue b/frontend/src/components/system/set-search.vuenew file mode 100644index 0000000..1a7e16a--- /dev/null+++ b/frontend/src/components/system/set-search.vue@@ -0,0 +1,117 @@+<template>+ <v-dialog v-model="data.showDialog" width="400px" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.setSearch')}`"></v-toolbar>+ <v-card-text>+ <vxe-table+ ref="xTable"+ :checkbox-config="{ checkRowKeys: data.actions }"+ :data="data.searchList"+ :radio-config="{ labelField: 'value' }"+ :row-config="{ isHover: true, keyField: 'value' }"+ align="center"+ row-id="value"+ max-height="500"+ @checkbox-all="method.selectAllEvent"+ @checkbox-change="method.selectChangeEvent"+ >+ <vxe-column type="checkbox" width="60"></vxe-column>+ <vxe-column :title="$t('base.roleMenu.modalTitle.actionTitle')" field="label"></vxe-column>+ </vxe-table>+ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog()">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script setup lang="tsx">+import { reactive, ref } from 'vue'+import i18n from '@/languages/i18n'+import searchSetting from '@/constant/searchSettingSet'+import { setStorage, getStorage } from '@/utils/common'+import { hookComponent } from '@/components/system'++const emit = defineEmits(['success'])++const xTable = ref()++const props = defineProps<{+ options: string[]+ i18nKey: string+}>()++const data = reactive({+ showDialog: false as boolean,+ actions: [] as string[],+ searchList: [] as {+ label: string+ value: string+ }[],+ menu_name: '' as string+})++const method = reactive({+ openDialog: (menu_name: string) => {+ data.menu_name = menu_name++ // 获取当前路由的所有搜索项+ data.searchList = searchSetting[data.menu_name].list.map((item: { type: string; name: string }) => ({+ label: i18n.global.t(`${ props.i18nKey }.${ item.name }`),+ value: item.name+ }))++ // 赋值初始值+ data.actions = [...props.options]++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ submit: () => {+ if (data.actions.length > 3 || data.actions.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.setSearchError') }`+ })+ return+ }++ let storage = getStorage('menu_search_setting')++ if (storage) {+ storage[data.menu_name] = data.actions+ } else {+ storage = {+ [data.menu_name]: data.actions+ }+ }++ setStorage('menu_search_setting', storage)++ emit('success')++ method.closeDialog()+ },+ selectAllEvent: ({ checked }) => {+ checked ? (data.actions = data.searchList.map((item) => item.value)) : (data.actions = [])+ },+ selectChangeEvent: () => {+ const records = xTable.value.getCheckboxRecords()+ data.actions = records.map((item) => item.value)+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/components/system/view-log-dialog.vue b/frontend/src/components/system/view-log-dialog.vuenew file mode 100644index 0000000..e1522e3--- /dev/null+++ b/frontend/src/components/system/view-log-dialog.vue@@ -0,0 +1,258 @@+<template>+ <v-dialog v-model="data.showDialog" width="80%" height="80%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.homeHeader.log')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col :cols="3">+ <v-card :height="searchFormHeight">+ <NavListVue+ :list-data="data.menuList"+ :title="data.navListOptions.title"+ :label-key="data.navListOptions.labelKey"+ :index-key="data.navListOptions.indexKey"+ :index-value="data.navListOptions.indexValue"+ @item-click="method.navListClick"+ />+ </v-card>+ </v-col>+ <v-col :cols="9">+ <v-row justify="end" @keyup.enter="method.sureSearch">+ <v-col :cols="4">+ <v-text-field+ v-model="data.searchForm.user_name"+ :label="$t('system.viewLog.user_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ >+ </v-text-field>+ </v-col>+ </v-row>++ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" align="center" :height="tableHeight" :data="data.tableData">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="user_name" width="140" :title="$t('system.viewLog.user_name')"></vxe-column>+ <vxe-column field="action_content" :title="$t('system.viewLog.action_content')"></vxe-column>+ <vxe-column+ field="action_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('system.viewLog.action_time')"+ >+ </vxe-column>+ </vxe-table>++ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </v-col>+ </v-row>+ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog()">{{ $t('system.page.close') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script setup lang="tsx">+import { reactive, computed, ref, onMounted, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import i18n from '@/languages/i18n'+import { computedSelectTableSearchHeight } from '@/constant/style'+import { getActionLog } from '@/api/sys/system'+import { DEFAULT_PAGE_SIZE, PAGE_SIZE, PAGE_LAYOUT } from '@/constant/vxeTable'+import { hookComponent } from '.'+import { PageConfigProps } from '@/types/System/Form'+import { formatDate } from '@/utils/format/formatSystem'+import customPager from '@/components/custom-pager.vue'+import { actionDict } from '@/view/base/roleMenu/actionList'+import NavListVue from '@/components/page/nav-list.vue'+import { setSearchObject } from '@/utils/common'+import { DEBOUNCE_TIME } from '@/constant/system'++const menuList = [] as any[]++Object.keys(actionDict).forEach((key) => {+ // if (key === 'companySetting') {+ // menuList.push({ type: 'subheader', title: i18n.global.t('router.sideBar.baseModule') })+ // } else if (key === 'stockAsn') {+ // menuList.push({ type: 'subheader', title: i18n.global.t('router.sideBar.stockAsn') })+ // } else if (key === 'stockManagement') {+ // menuList.push({ type: 'subheader', title: i18n.global.t('router.sideBar.statisticAnalysis') })+ // } else if (key === 'warehouseProcessing') {+ // menuList.push({ type: 'subheader', title: i18n.global.t('router.sideBar.warehouseWorkingModule') })+ // } else if (key === 'deliveryManagement') {+ // menuList.push({ type: 'subheader', title: i18n.global.t('router.sideBar.deliveryManagement') })+ // }++ const obj = {+ title: i18n.global.t(`router.sideBar.${ key }`),+ value: key+ }++ menuList.push(obj)+})++const data = reactive({+ showDialog: false as boolean,+ menuList: menuList as any[],+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ } as PageConfigProps,+ tableData: [] as {+ id: number+ vue_path: string+ user_name: string+ action_content: string+ action_time: string+ }[],+ // Menu Search Object+ menuSearchObject: {} as any,+ // Fuzzy search object+ likeSearchObject: [] as any[],+ // Navigation List Configuration+ navListOptions: {+ title: i18n.global.t('base.roleMenu.menu_name'),+ labelKey: 'title',+ indexKey: 'value',+ indexValue: ''+ },+ // query form+ searchForm: {+ user_name: ''+ },+ // anti-shake+ timer: ref<any>(null)+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))+const tableHeight = computed(() => {+ let height: any = computedSelectTableSearchHeight({})++ height = height.split('px')[0]++ return `${ height - 74 }px`+})++onMounted(() => {+ const menu = data.menuList.find((item) => !item.type)++ // The first menu is selected by default+ if (menu) {+ method.navListClick(menu)+ }+})++const method = reactive({+ // Click navList+ navListClick: (item: { title: string; value: string }) => {+ data.navListOptions.indexValue = String(item.value)++ data.menuSearchObject = {+ name: 'vue_path',+ operator: 1,+ text: item.value,+ value: item.value+ }++ method.list()+ },+ list: async () => {+ const { data: res } = await getActionLog({ ...data.tablePage, searchObjects: [data.menuSearchObject, ...data.likeSearchObject] })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ openDialog: () => {+ data.showDialog = true++ method.list()+ },+ closeDialog: () => {+ data.showDialog = false+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.list()+ }),+ sureSearch: () => {+ data.likeSearchObject = setSearchObject(data.searchForm)++ method.list()+ }+})++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.searchForm {+ // box-sizing: border-box;+ box-shadow: rgb(153, 153, 153) 0px 0px 10px;+ border-radius: 5px;+ overflow: auto;+ &::-webkit-scrollbar {+ width: 6px;+ }++ &::-webkit-scrollbar-thumb {+ background-color: #c6c6c6;+ border-radius: 10px;+ }++ &::-webkit-scrollbar-thumb:hover {+ background-color: #a8a8a8;+ }++ &::-webkit-scrollbar-button {+ display: none;+ }+}+</style>diff --git a/frontend/src/constant/print.ts b/frontend/src/constant/print.tsnew file mode 100644index 0000000..1c52f10--- /dev/null+++ b/frontend/src/constant/print.ts@@ -0,0 +1,61 @@+export const PRINT_MENU = [{+ vue_path: 'commodityManagement',+ i18nName: 'base.commodityManagement',+ children: [{+ tab_page: 'print_page_main',+ form: {+ detailList: {+ name: 'print_data_main',+ columns: ['sku_code', 'sku_name', 'category_name', 'spu_description', 'supplier_name', 'bar_code', 'weight', 'lenght', 'width', 'height', 'volume', 'cost', 'price']+ }+ }+ }, {+ tab_page: 'print_page_detail',+ form: {+ id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: {+ name: 'print_data_detail',+ columns: ['sku_code', 'sku_name', 'unit', 'weight', 'width', 'height', 'volume', 'cost', 'price']+ }+ }+ }]+},+{+ vue_path: 'customer',+ i18nName: 'base.customer',+ children: [{+ tab_page: 'print_page_main',+ form: {+ detailList: {+ name: 'print_data_main',+ columns: ['customer_name', 'city', 'address', 'manager', 'email', 'contact_tel']+ }++ }+ }, {+ tab_page: 'print_page_detail',+ form: {+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ }+ }]+},++]\ No newline at end of filediff --git a/frontend/src/constant/searchSettingSet.ts b/frontend/src/constant/searchSettingSet.tsnew file mode 100644index 0000000..5a0622b--- /dev/null+++ b/frontend/src/constant/searchSettingSet.ts@@ -0,0 +1,68 @@+export default {+ asnStatistic: {+ default: ['supplier_name', 'sku_name'],+ list: [+ {+ type: 'string',+ name: 'spu_code'+ },+ {+ type: 'string',+ name: 'spu_name'+ },+ {+ type: 'string',+ name: 'sku_code'+ },+ {+ type: 'string',+ name: 'supplier_name'+ },+ {+ type: 'string',+ name: 'sku_name'+ },+ {+ type: 'string',+ name: 'goods_owner_name'+ }+ ]+ },+ deliveryStatistic: {+ default: ['sku_code', 'warehouse_name', 'customer_name'],+ list: [+ {+ type: 'string',+ name: 'spu_code'+ },+ {+ type: 'string',+ name: 'spu_name'+ },+ {+ type: 'string',+ name: 'sku_code'+ },+ {+ type: 'string',+ name: 'sku_name'+ },+ {+ type: 'string',+ name: 'warehouse_name'+ },+ {+ type: 'string',+ name: 'customer_name'+ },+ {+ type: 'datetime',+ name: 'delivery_date_from'+ },+ {+ type: 'datetime',+ name: 'delivery_date_to'+ }+ ]+ }+}diff --git a/frontend/src/languages/i18n.ts b/frontend/src/languages/i18n.tsindex 2971134..04baef3 100644--- a/frontend/src/languages/i18n.ts+++ b/frontend/src/languages/i18n.ts@@ -1,19 +1,39 @@+import zhCN from 'vxe-table/lib/locale/lang/zh-CN'+import enUS from 'vxe-table/lib/locale/lang/en-US'+import zhTW from 'vxe-table/lib/locale/lang/zh-TW'+import { createI18n } from 'vue-i18n'-import messages from './langs/index'-import { getSelcectedLang } from './method/index'+import { getSelectedLang } from './method/index'++import en from './langsJson/en.json'+import cn from './langsJson/cn.json'+import tw from './langsJson/tw.json'const i18n = createI18n({legacy: false,globalInjection: true,locale: getStorageLang(),- messages+ messages: {+ zh_CN: {+ ...cn,+ ...zhCN+ },+ en_US: {+ ...en,+ ...enUS+ },+ zh_TW: {+ ...tw,+ ...zhTW+ }+ }})// get language in storage or defaultfunction getStorageLang() {const lang = localStorage.getItem('language')if (lang) {- return getSelcectedLang(lang)+ return getSelectedLang(lang)}return 'en_US'}diff --git a/frontend/src/languages/langsJson/cn.json b/frontend/src/languages/langsJson/cn.jsonnew file mode 100644index 0000000..3048304--- /dev/null+++ b/frontend/src/languages/langsJson/cn.json@@ -0,0 +1,736 @@+{+ "base": {+ "commodityCategorySetting": {+ "category_name": "商品类别",+ "create_time": "创建时间",+ "creator": "创建人",+ "parent_name": "所属类别"+ },+ "commodityManagement": {+ "bar_code": "商品条码",+ "brand": "品牌",+ "category_name": "商品类别",+ "cost": "商品成本",+ "height": "商品高度",+ "lenght": "商品长度",+ "length_unit": "长度单位",+ "origin": "产地",+ "price": "商品价格",+ "printBarCode": "打印条码",+ "printQrCode": "打印二维码",+ "print_data_detail": "明细数据",+ "print_data_main": "数据列表",+ "print_page_detail": "商品管理",+ "print_page_main": "商品管理-列表",+ "saftyStock": "安全库存",+ "sku_code": "规格编码",+ "sku_name": "规格名称",+ "spu_code": "商品编码",+ "spu_description": "商品描述",+ "spu_name": "商品名称",+ "supplier_name": "供应商名称",+ "unit": "商品单位",+ "volume": "商品体积",+ "volume_unit": "体积单位",+ "weight": "商品重量",+ "weight_unit": "重量单位",+ "width": "商品宽度"+ },+ "companySetting": {+ "address": "详细地址",+ "city": "所在城市",+ "company_name": "公司名称",+ "contact_tel": "联系方式",+ "manager": "负责人"+ },+ "customer": {+ "address": "详细地址",+ "city": "所在城市",+ "contact_tel": "联系方式",+ "create_time": "创建时间",+ "creator": "创建人",+ "customer_name": "客户名称",+ "email": "Email",+ "is_valid": "是否有效",+ "last_update_time": "最后更新时间",+ "manager": "负责人",+ "print_data_main": "数据列表",+ "print_page_detail": "客户信息",+ "print_page_main": "客户信息-列表"+ },+ "freightSetting": {+ "arrival_city": "到货城市",+ "carrier": "承运商",+ "create_time": "创建时间",+ "creator": "创建人",+ "departure_city": "始发城市",+ "freightSelectModal": "运费选择框",+ "is_valid": "是否有效",+ "last_update_time": "最后更新时间",+ "min_payment": "最小运费",+ "price_per_volume": "单立方米运费",+ "price_per_weight": "单公斤运费"+ },+ "ownerOfCargo": {+ "address": "详细地址",+ "city": "所在城市",+ "contact_tel": "联系方式",+ "create_time": "创建时间",+ "creator": "创建人",+ "goods_owner_name": "货主名称",+ "manager": "负责人"+ },+ "printSolution": {+ "detailList": "明细数据",+ "solution_name": "方案名称",+ "tab_page": "页面名称",+ "vue_path": "菜单名称"+ },+ "roleMenu": {+ "beforeUpdateOrDel": "请先选择需要处理的数据!",+ "dataEmpty": "暂无权限",+ "expandRow": "展开行",+ "menu_name": "菜单名称",+ "modalTitle": {+ "actionTitle": "操作权限",+ "editMenuAction": "编辑菜单操作权限"+ },+ "opeartionFunctionName": {+ "deliveryManagement": {+ "delivered": "出库",+ "invoice": "发货单",+ "packaged": "打包",+ "picked": "拣货",+ "signedIn": "已签收",+ "weighed": "称重"+ },+ "stockAsn": {+ "delivered": "待到货",+ "detail": "收货明细",+ "notice": "到货通知",+ "putOnTheShelf": "待上架",+ "sorted": "待分拣",+ "unloaded": "待卸货"+ },+ "stockManagement": {+ "area": "库位列表",+ "stock": "库存列表"+ },+ "warehouseSetting": {+ "area": "库区设置",+ "location": "库位设置",+ "warehouse": "仓库设置"+ }+ },+ "operation": "操作权限",+ "operationTitle": {+ "add": "新增",+ "confirm": "确认操作",+ "confirmAdjust": "确认调整",+ "confirmOpeartion": "确认操作",+ "delete": "删除",+ "delivery": "出库",+ "editArrival": "编辑上架数量",+ "editCount": "编辑数量",+ "export": "导出",+ "freeze": "冻结",+ "group": "组合加工",+ "import": "导入",+ "package": "打包",+ "printBarCode": "打印条码",+ "printQrCode": "打印二维码",+ "refresh": "刷新",+ "resetPwd": "重置密码",+ "revoke": "撤回",+ "saftyStock": "安全库存",+ "save": "保存",+ "setCarrier": "设置承运单位",+ "signIn": "签收",+ "split": "拆分加工",+ "stock": "库存",+ "unfreeze": "解冻",+ "weigh": "称重"+ },+ "role_name": "角色名称"+ },+ "supplier": {+ "address": "详细地址",+ "city": "所在城市",+ "contact_tel": "联系方式",+ "create_time": "创建时间",+ "creator": "创建人",+ "email": "Email",+ "is_valid": "是否有效",+ "last_update_time": "最后更新时间",+ "manager": "负责人",+ "supplier_name": "供应商名称"+ },+ "userManagement": {+ "addSuccessTip": "新增成功, 用户初始密码为: ",+ "afterResetPwd": "重置密码成功, 新密码为: ",+ "auth_string": "密码",+ "beforeResetPwd": "您确定要重置这些用户的密码吗?",+ "checkboxIsNull": "请选中数据!",+ "contact_tel": "联系方式",+ "email": "Email",+ "is_valid": "是否有效",+ "restPwd": "重置密码",+ "sex": "性别",+ "userModalTitle": "用户选择框",+ "user_name": "员工名称",+ "user_num": "员工编号",+ "user_register_name": "用户名",+ "user_role": "角色"+ },+ "userRoleSetting": {+ "is_valid": "是否有效",+ "role_name": "用户角色"+ },+ "warehouseSetting": {+ "address": "详细地址",+ "area_name": "库区名称",+ "area_property": "库区类型",+ "city": "所在城市",+ "contact_tel": "联系方式",+ "create_time": "创建时间",+ "creator": "创建人",+ "defective_area": "次品区",+ "email": "Email",+ "inventory_area": "存货区",+ "is_valid": "是否有效",+ "last_update_time": "最后更新时间",+ "layer_number": "层号",+ "locationSelectModal": "库位选择框",+ "locationSetting": "库位设置",+ "location_heigth": "库位高(m)",+ "location_length": "库位长(m)",+ "location_load": "库位承重(kg)",+ "location_name": "库位编码",+ "location_volume": "库位容积(m³)",+ "location_width": "库位宽(m)",+ "manager": "负责人",+ "picking_area": "拣货区",+ "receiving_area": "收货区",+ "reservoirSetting": "库区设置",+ "return_area": "退货区",+ "roadway_number": "巷道号",+ "shelf_number": "货架号",+ "stocking_area": "备货区",+ "tag_number": "位号",+ "warehourseSelectModal": "库位选择框",+ "warehouseSetting": "仓库设置",+ "warehouse_name": "仓库名称"+ }+ },+ "homepage": {+ "subTitle": "现代化仓库管理系统"+ },+ "login": {+ "loginSuccess": "登录成功",+ "mainButtonLabel": "登录",+ "notAuthority": "该账号未分配菜单权限,请联系管理员",+ "password": "密码",+ "register": "注册",+ "registerTips": "没有账号?点此注册一个!",+ "rememberTips": "记住账号密码",+ "userName": "用户名",+ "welcomeTitle": "欢迎来到ModernWMS!👋🏻"+ },+ "router": {+ "sideBar": {+ "asnStatistic": "收货统计",+ "baseModule": "基础设置",+ "commodityCategorySetting": "商品类别设置",+ "commodityManagement": "商品管理",+ "companySetting": "公司信息",+ "customer": "客户信息",+ "deliveryManagement": "发货管理",+ "deliveryStatistic": "发货统计",+ "freightSetting": "运费设置",+ "homepage": "首页",+ "menuBasicSettings": "菜单基础设置",+ "ownerOfCargo": "货主信息",+ "print": "打印设置",+ "roleMenu": "权限设置",+ "saftyStock": "安全库存",+ "statisticAnalysis": "统计分析",+ "stockAsn": "收货管理",+ "stockManagement": "库存管理",+ "supplier": "供应商信息",+ "userManagement": "用户管理",+ "userRoleSetting": "角色设置",+ "vwms": "可视化仓库",+ "warehouseAdjust": "库存调整",+ "warehouseFreeze": "库存冻结",+ "warehouseMove": "库存移动",+ "warehouseProcessing": "仓内加工",+ "warehouseSetting": "仓库设置",+ "warehouseTaking": "库存盘点",+ "warehouseWorkingModule": "仓内作业"+ }+ },+ "system": {+ "checkText": {+ "checkFormFail": "操作失败, 请检查数据后重试!",+ "decimal": " 小数",+ "inputDecimalMsg": "的小数位",+ "inputIntMsg": "的整数位",+ "integer": "整数",+ "lengthValid": "字段长度应该在",+ "mustInput": "请填写",+ "mustSelect": "请选择",+ "pleaseEnter": "请输入长度为"+ },+ "combobox": {+ "sex": {+ "female": "女",+ "male": "男"+ },+ "yesOrNo": {+ "no": "否",+ "yes": "是"+ }+ },+ "hiprint": {+ "addScheme": "新增方案",+ "auxiliary": "辅助",+ "emptyScheme": "不存在方案",+ "field": "字段",+ "hline": "横线",+ "oval": "椭圆",+ "rect": "矩形",+ "repeatScheme": "方案名称已存在",+ "routine": "常规",+ "schemeName": "方案名称",+ "text": "文本",+ "vline": "竖线"+ },+ "homeHeader": {+ "changePwd": "修改密码",+ "confrimNewPwd": "确认新密码",+ "log": "系统日志",+ "logout": "注销",+ "newPwd": "新密码",+ "oldPwd": "旧密码"+ },+ "hookComponent": {+ "dialog": {+ "defaultClose": "关闭",+ "defaultConfirm": "确认",+ "defaultTitle": "提示"+ }+ },+ "page": {+ "add": "新增",+ "chooseFile": "选择文件",+ "close": "关闭",+ "confirm": "确认",+ "delete": "删除",+ "edit": "编辑",+ "export": "导出",+ "exportTemplate": "导出模板",+ "gridColumnGap": "列间距(px)",+ "gridRowGap": "行间距(px)",+ "import": "导入",+ "insertOneRow": "新增一行",+ "noData": "暂无数据",+ "operate": "操作",+ "preView": "预览",+ "preview": "预览",+ "print": "打印",+ "refresh": "刷新",+ "reset": "重置",+ "revoke": "撤回",+ "rowsNumber": "每行放置数量",+ "submit": "提交",+ "update": "修改",+ "view": "查看",+ "setSearch": "设置查询条件",+ "chart": "图表",+ "table": "表格"+ },+ "pager": {+ "goTo": "前往",+ "pageSizes": "条/页",+ "record": "条记录",+ "total": "共"+ },+ "tips": {+ "beforeAsnConfirm": "确认到货?",+ "beforeAsnSorted": "确认分拣完成?",+ "beforeAsnUnload": "确认卸货?",+ "beforeDeleteDetailMessage": "您确定要删除此行吗?",+ "beforeDeleteMessage": "您确定要删除此条数据吗?",+ "beforeOperation": "您确定要进行此操作吗?",+ "detailHasItemRepeat": "明细中含有重复项目!",+ "detailLengthIsZero": "请添加明细数据!",+ "fail": "失败!",+ "noData": "暂无数据",+ "requestFail": "接口请求失败,请重试",+ "requestTimeout": "请求超时!",+ "success": "成功!",+ "vaildEmail": "请输入正确的邮箱格式!",+ "verifyPwd": "校验失败, 新密码与确认新密码不同!",+ "setSearchError": "设置失败! 查询条件数量应该在1-3个之间",+ "dataExpirationAutoRefresh": "操作失败! 数据已过期, 已为您自动刷新数据",+ "dataExpiration": "操作失败! 数据已过期, 请刷新后重试"+ },+ "viewLog": {+ "action_content": "操作内容",+ "action_time": "操作时间",+ "user_name": "操作人"+ }+ },+ "wms": {+ "deliveryManagement": {+ "NoItemSelected": "请至少选中一项商品进行出库!",+ "ViewInventoryDetails": "查看商品明细",+ "arrival_city": "到货城市",+ "backToThePreviousStep": "撤回到上一个流程",+ "bar_code": "条码",+ "carrier": "承运单位",+ "confirmBack": "确认撤回",+ "confirmDelivery": "确认出库",+ "confirmOrder": "确认发货单",+ "confirmPicking": "确认拣货",+ "confirmSignIn": "确认签收",+ "confirmSuccess": "确认发货单成功!",+ "create_time": "创建时间",+ "creator": "创建人",+ "customer_name": "客户名称",+ "damagedQuantity": "到货破损数量",+ "delivery": "出库",+ "deliveryReady": "已出库",+ "deliveryTodo": "未出库",+ "departure_city": "始发城市",+ "detailQty": "数量",+ "detailQuantityIsZero": "发货数量不能为0",+ "detailVolume": "体积",+ "detailWeight": "重量",+ "dispatch_no": "发货单号",+ "dispatch_status": "发货单状态",+ "exceedingQuantity": "不能超过总数量",+ "goodsToBePicked": "待拣货",+ "incorrectStatusMsg": "操作失败, 状态应该为",+ "invalidValue": "请输入有效数值",+ "irreversible": "此操作不可逆",+ "newShipment": "新发货",+ "opeartionCheckboxIsNull": "未选中可操作的数据!",+ "or": "或",+ "orderDetail": "发货单商品详情",+ "order_qty": "订单数量",+ "outOfWarehouse": "出库",+ "package": "打包",+ "packageReady": "已打包",+ "packageTodo": "未打包",+ "package_no": "打包流水号",+ "package_person": "打包员",+ "package_qty": "已打包数量",+ "package_time": "打包时间",+ "packaged": "打包",+ "picked": "已拣货",+ "picked_qty": "已拣货数量",+ "preShipment": "预发货",+ "qty": "总数量",+ "qty_available": "可用数量",+ "quantityIsZero": "请保证选择的商品至少有一项出库数量大于0!",+ "quantityOverflow": "发货数量之和不能超出发货单数量",+ "setFreight": "设置承运单位",+ "shipment": "发货单",+ "signIn": "签收",+ "signInQty": "实际签收数量",+ "signedIn": "已签收",+ "sku_code": "规格编码",+ "sku_name": "规格名称",+ "spu_code": "商品编码",+ "spu_description": "商品描述",+ "spu_name": "商品名称",+ "state": "状态",+ "toBeDelivered": "待出库",+ "toBePackaged": "待打包",+ "toBeWeighed": "待称重",+ "unit": "商品单位",+ "unpackage_qty": "待打包数量",+ "unpicked_qty": "待拣货数量",+ "unweighing_qty": "待称重数量",+ "validQtyMsgPackage": "请输入有效数值, 且不能超过总数量",+ "validQtyMsgSignIn": "请输入有效数值, 且不能超过总数量",+ "volume": "总体积",+ "warehouse_name": "仓库名称",+ "waybill_no": "运单号",+ "weigh": "称重",+ "weighReady": "已称重",+ "weighTodo": "未称重",+ "weighed": "称重",+ "weighing_no": "称重单号",+ "weighing_person": "称重员",+ "weighing_weight": "称重重量",+ "weight": "总重量"+ },+ "deliveryBatchAllocation": {+ "dateFrom": "时间从",+ "dateTo": "时间至",+ "allocationRule": "分配规则",+ "startAllocation": "开始分配"+ },+ "deliveryStatistic": {+ "amount": "数量",+ "amount_money": "金额",+ "category_name": "商品类别",+ "customer_name": "客户名称",+ "delivery_date": "出库时间",+ "delivery_qty": "出库数量",+ "dispatch_no": "发货单号",+ "goods_owner_name": "货主名称",+ "location_name": "库位名称",+ "series_number": "序列号",+ "sku_code": "规格编码",+ "sku_name": "规格名称",+ "spu_code": "商品编码",+ "spu_name": "商品名称",+ "warehouse_name": "仓库名称",+ "delivery_date_from": "出库时间从",+ "delivery_date_to": "出库时间至"+ },+ "saftyStock": {+ "qty": "数量",+ "qty_available": "可用数量",+ "qty_frozen": "冻结数量",+ "qty_locked": "锁定数量",+ "safety_stock_qty": "安全库存数量",+ "sku_code": "规格编码",+ "sku_id": "规格标识",+ "sku_name": "规格名称",+ "spu_code": "商品编码",+ "spu_name": "商品名称",+ "warehouse_name": "仓库名称"+ },+ "skuInfo": {+ "bar_code": "商品条码",+ "brand": "品牌",+ "category_id": "商品类别标识",+ "category_name": "商品类别",+ "cost": "商品成本",+ "height": "商品高度",+ "lenght": "商品长度",+ "length_unit": "长度单位",+ "origin": "产地",+ "price": "商品价格",+ "sku_code": "规格编码",+ "sku_id": "规格标识",+ "sku_name": "规格名称",+ "spu_code": "商品编码",+ "spu_description": "商品描述",+ "spu_id": "商品spu标识",+ "spu_name": "商品名称",+ "supplier_id": "供应商标识",+ "supplier_name": "供应商名称",+ "unit": "商品单位",+ "volume": "商品体积",+ "volume_unit": "体积单位",+ "weight": "总重量",+ "weight_unit": "重量单位",+ "width": "商品宽度"+ },+ "stock": {+ "location_name": "库位编码",+ "qty_available": "可用数量",+ "skuSelectModal": "商品选择框",+ "stockSelectModal": "库存选择框",+ "warehouse": "仓库名称"+ },+ "stockAsn": {+ "tabNotice": "到货通知",+ "tabReceiptDetails": "收货明细",+ "tabToDoArrival": "待到货",+ "tabToDoGrounding": "待上架",+ "tabToDoSorting": "待分拣",+ "tabToDoUnload": "待卸货"+ },+ "stockAsnInfo": {+ "actual_qty": "上架数量",+ "addSorting": "分拣",+ "arrival_time": "到达时间",+ "asn_batch": "批次",+ "asn_no": "到货通知书编号",+ "asn_qty": "到货通知书数据",+ "asn_status": "到货通知书状态",+ "can_putaway_qty": "可上架数量",+ "confirmArrival": "确认到货",+ "confirmUnload": "确认卸货",+ "damage_qty": "破损数量",+ "editGrounding": "编辑",+ "editSorting": "编辑",+ "estimated_arrival_time": "预计到达时间",+ "exceedTip": "上架数量不可超过可上架数量!",+ "exceedingPrompt": "序列号数量不能超过分拣数量!",+ "goods_owner_id": "货主标识",+ "goods_owner_name": "货主名称",+ "grounding": "上架",+ "id": "标识",+ "is_valid": "是否有效",+ "length_unit": "长度单位",+ "more_qty": "超量数量",+ "mustInputErrorMsg": "请填写到货时间!",+ "notLocation": "请选择库位后进行上架!",+ "num": "编号",+ "origin": "产地",+ "putaway_qty": "上架数量",+ "revoke": "撤销",+ "selectLocation": "选择库位编码",+ "selectOne": "请至少选择一条数据!",+ "series_number": "序列号",+ "shortage_qty": "短少数量",+ "sku_code": "规格编码",+ "sku_id": "商品sku标识",+ "sku_name": "规格名称",+ "sorted_qty": "分拣数量",+ "spu_code": "商品编码",+ "spu_id": "商品spu标识",+ "spu_name": "商品名称",+ "supplier_id": "供应商标识",+ "supplier_name": "供应商名称",+ "unloadPerson": "卸货人",+ "unloadTime": "卸货时间",+ "viewDetail": "查看明细",+ "volume": "总体积",+ "volume_unit": "体积单位",+ "weight": "总重量",+ "weight_unit": "重量单位"+ },+ "stockList": {+ "qty": "数量",+ "qty_asn": "到货通知书数量",+ "qty_available": "可用数量",+ "qty_frozen": "冻结数量",+ "qty_locked": "锁定数量",+ "qty_sorted": "已分拣数量",+ "qty_to_sort": "待分拣数量",+ "qty_to_unload": "待卸货数量",+ "shortage_qty": "欠货数量",+ "sku_code": "规格编码",+ "sku_id": "规格标识",+ "spu_code": "商品编码",+ "spu_name": "商品名称"+ },+ "stockLocation": {+ "location_name": "库位名称",+ "qty": "数量",+ "qty_available": "可用数量",+ "qty_frozen": "冻结数量",+ "qty_locked": "锁定数量",+ "series_number": "序列号",+ "sku_code": "规格编码",+ "sku_id": "规格标识",+ "sku_name": "规格名称",+ "spu_code": "商品编码",+ "spu_name": "商品名称",+ "warehouse_name": "仓库名称"+ },+ "stockManagement": {+ "stock": "库存列表",+ "stockLocation": "库位列表"+ },+ "warehouseWorking": {+ "warehouseAdjust": {+ "beforeConfirmAdjust": "您确认对该条数据进行调整吗?",+ "confirmAdjust": "确认调整",+ "create_time": "创建时间",+ "creator": "创建人",+ "handle_time": "操作时间",+ "handler": "操作人",+ "job_code": "作业单号",+ "job_type": "作业类型",+ "location_name": "所在库位",+ "processCombine": "仓内加工",+ "processSplit": "仓内加工",+ "qty": "调整差异数量",+ "warehouse": "所在仓库",+ "warehouseMove": "移库",+ "warehouseTake": "盘点"+ },+ "warehouseFreeze": {+ "create_time": "创建时间",+ "creator": "创建人",+ "freeze": "冻结",+ "handle_time": "操作时间",+ "handler": "操作人",+ "job_code": "作业单号",+ "job_type": "作业类型",+ "location_name": "所在库位",+ "unfreeze": "解冻",+ "warehouse": "所在仓库"+ },+ "warehouseMove": {+ "adjusted": "已调整",+ "beforeConfirmMove": "您确认对该条数据进行移库吗?",+ "confirmMove": "确认移库",+ "create_time": "创建时间",+ "creator": "创建人",+ "dest_googs_location_name": "目标库位",+ "dest_googs_warehouse": "目标仓库",+ "handle_time": "操作时间",+ "handler": "操作人",+ "job_code": "作业单号",+ "move_status": "作业状态",+ "orig_goods_location_name": "来源库位",+ "orig_goods_warehouse": "来源仓库",+ "qty": "数量",+ "unadjust": "未调整"+ },+ "warehouseProcessing": {+ "adjust_status": "是否已调整",+ "alreadyAdjust": "该数据已完成调整,不可删除",+ "alreadyProcess": "该数据已完成加工,不可删除",+ "beforeConfirmAdjust": "您确认对该条数据进行调整吗?",+ "beforeConfirmProcess": "您确认对该条数据进行加工吗?",+ "confirmAdjust": "确认调整",+ "confirmProcess": "确认加工",+ "create_time": "创建时间",+ "creator": "创建人",+ "is_source": "是否来源商品",+ "is_update_stock": "是否已更新库存",+ "job_code": "作业单号",+ "job_type": "作业类型",+ "last_update_time": "最后更新时间",+ "process_combine": "组合加工",+ "process_split": "拆分加工",+ "process_status": "加工状态",+ "process_time": "操作时间",+ "processor": "操作人",+ "qty": "数量",+ "qtyMoreThanAvailable": "不可超过可用数量",+ "sku_code": "规格编码",+ "sku_name": "规格名称",+ "source": "来源",+ "spu_code": "商品编码",+ "spu_name": "商品名称",+ "target": "目标",+ "target_location": "目标库位",+ "target_warehouse": "目标仓库",+ "unit": "商品单位"+ },+ "warehouseTaking": {+ "addFromCommodity": "选择商品",+ "addFromStock": "选择库存",+ "addTips": "当目标库存不存在时,可通过手动选择商品和库位来新增记录",+ "beforeConfirmAdjust": "您确认对该条数据进行调整吗?",+ "book_qty": "账面数量",+ "confirmAdjust": "确认调整",+ "confirmTaking": "确认盘点",+ "counted_qty": "盘点数量",+ "create_time": "创建时间",+ "creator": "创建人",+ "difference_qty": "差异数量",+ "finish": "已完成",+ "handle_time": "操作时间",+ "handler": "操作人",+ "job_code": "作业单号",+ "job_status": "作业状态",+ "location_name": "所在库位",+ "unfinish": "待作业",+ "warehouse": "所在仓库"+ }+ }+ }+}diff --git a/frontend/src/languages/langsJson/en.json b/frontend/src/languages/langsJson/en.jsonnew file mode 100644index 0000000..79a70b8--- /dev/null+++ b/frontend/src/languages/langsJson/en.json@@ -0,0 +1,736 @@+{+ "base": {+ "commodityCategorySetting": {+ "category_name": "Commodity category",+ "create_time": "Create Time",+ "creator": "Creator",+ "parent_name": "Parent Category"+ },+ "commodityManagement": {+ "bar_code": "Specification Code",+ "brand": "Brand",+ "category_name": "Commodity Category",+ "cost": "Commodity Cost",+ "height": "Commodity Height",+ "lenght": "Commodity Length",+ "length_unit": "Length Unit",+ "origin": "origin",+ "price": "Commodity Price",+ "printBarCode": "Print barcode",+ "printQrCode": "Print QR code",+ "print_data_detail": "Detail List",+ "print_data_main": "Data List",+ "print_page_detail": "commodityManagement",+ "print_page_main": "commodityManagement-List",+ "saftyStock": "Safety stock",+ "sku_code": "Specification Code",+ "sku_name": "Specification Name",+ "spu_code": "Commodity Code",+ "spu_description": "Commodity Description",+ "spu_name": "Commodity Name",+ "supplier_name": "Supplier Name",+ "unit": "Commodity Unit",+ "volume": "Commodity Volume",+ "volume_unit": "Volume Unit",+ "weight": "Commodity Weight",+ "weight_unit": "Weight Unit",+ "width": "Commodity Width"+ },+ "companySetting": {+ "address": "Detailed Address",+ "city": "City",+ "company_name": "Corporate Name",+ "contact_tel": "Contact Information",+ "manager": "Person In Charge"+ },+ "customer": {+ "address": "Address",+ "city": "City",+ "contact_tel": "Contact Tel",+ "create_time": "Create Time",+ "creator": "Creator",+ "customer_name": "Customer Name",+ "email": "Email",+ "is_valid": "Valid",+ "last_update_time": "Last Update Time",+ "manager": "Manager",+ "print_data_main": "Data List",+ "print_page_detail": "Customer",+ "print_page_main": "Customer List"+ },+ "freightSetting": {+ "arrival_city": "Arrival City",+ "carrier": "carrier",+ "create_time": "Create Time",+ "creator": "Creator",+ "departure_city": "Departure City",+ "freightSelectModal": "Freight Select Modal",+ "is_valid": "Valid",+ "last_update_time": "Last Update Time",+ "min_payment": "Min Payment",+ "price_per_volume": "Volume Fee",+ "price_per_weight": "Weight Fee"+ },+ "ownerOfCargo": {+ "address": "Detailed Address",+ "city": "City",+ "contact_tel": "Contact Information",+ "create_time": "Create Time",+ "creator": "Creator",+ "goods_owner_name": "Owner Of Cargo",+ "manager": "Person In Charge"+ },+ "printSolution": {+ "detailList": "detailList",+ "solution_name": "schemeName",+ "tab_page": "pageName",+ "vue_path": "menuName"+ },+ "roleMenu": {+ "beforeUpdateOrDel": "Please select the data to be processed first!",+ "dataEmpty": "Empty data",+ "expandRow": "Expand rows",+ "menu_name": "Menu Name",+ "modalTitle": {+ "actionTitle": "Operation permissions",+ "editMenuAction": "Edit menu operation permissions"+ },+ "opeartionFunctionName": {+ "deliveryManagement": {+ "delivered": "Delivered",+ "invoice": "Shipment",+ "packaged": "Packaged",+ "picked": "Picked",+ "signedIn": "Signed In",+ "weighed": "Weighed"+ },+ "stockAsn": {+ "delivered": "To Be Delivered",+ "detail": "Receipt Details",+ "notice": "Arrival notice",+ "putOnTheShelf": "To Be Put On The Shelf",+ "sorted": "To Be Sorted",+ "unloaded": "To Be Unloaded"+ },+ "stockManagement": {+ "area": "Stock Location",+ "stock": "Stock"+ },+ "warehouseSetting": {+ "area": "Reservoir Setting",+ "location": "Location Setting",+ "warehouse": "Warehouse Setting"+ }+ },+ "operation": "Operation permissions",+ "operationTitle": {+ "add": "Add",+ "confirm": "Confirm operation",+ "confirmAdjust": "Confirm adjustment",+ "confirmOpeartion": "Confirm operation",+ "delete": "Delete",+ "delivery": "Delivery",+ "editArrival": "Edit notice of arrival",+ "editCount": "Edit quantity",+ "export": "Export",+ "freeze": "Freeze",+ "group": "Combined processing",+ "import": "Import",+ "package": "Pack",+ "printBarCode": "Print barcode",+ "printQrCode": "Print QR code",+ "refresh": "Refresh",+ "resetPwd": "Reset password",+ "revoke": "Revoke",+ "saftyStock": "Safety stock",+ "save": "Save",+ "setCarrier": "Set carrier",+ "signIn": "Sign in",+ "split": "Split processing",+ "stock": "Inventory",+ "unfreeze": "Unfreeze",+ "weigh": "Weigh"+ },+ "role_name": "Role Name"+ },+ "supplier": {+ "address": "Address",+ "city": "City",+ "contact_tel": "Contact Tel",+ "create_time": "Create Time",+ "creator": "Creator",+ "email": "Email",+ "is_valid": "Valid",+ "last_update_time": "Last Update Time",+ "manager": "Manager",+ "supplier_name": "Supplier Name"+ },+ "userManagement": {+ "addSuccessTip": "Successfully added, user's initial password is: ",+ "afterResetPwd": "Password reset succeeded, the new password is ",+ "auth_string": "Password",+ "beforeResetPwd": "Are you sure you want to reset the passwords of these users?",+ "checkboxIsNull": "Please select data!",+ "contact_tel": "Contact Information",+ "email": "Email",+ "is_valid": "Valid",+ "restPwd": "Reset password",+ "sex": "Sex",+ "userModalTitle": "User selection",+ "user_name": "User Name",+ "user_num": "User Num",+ "user_register_name": "User Name",+ "user_role": "Role"+ },+ "userRoleSetting": {+ "is_valid": "Valid",+ "role_name": "User Role"+ },+ "warehouseSetting": {+ "address": "Address",+ "area_name": "Reservoir Name",+ "area_property": "Reservoir Category",+ "city": "City",+ "contact_tel": "Contact Tel",+ "create_time": "Create Time",+ "creator": "Creator",+ "defective_area": "Defective Area",+ "email": "Email",+ "inventory_area": "Inventory Area",+ "is_valid": "Valid",+ "last_update_time": "Last Update Time",+ "layer_number": "Layer Number",+ "locationSelectModal": "Location Select Modal",+ "locationSetting": "Location Setting",+ "location_heigth": "Location Height(m)",+ "location_length": "Location Length(m)",+ "location_load": "Location Load(kg)",+ "location_name": "Location Code",+ "location_volume": "Location Volume(m³)",+ "location_width": "Location Width(m)",+ "manager": "Manager",+ "picking_area": "Picking Area",+ "receiving_area": "Receiving Area",+ "reservoirSetting": "Reservoir Setting",+ "return_area": "Return Area",+ "roadway_number": "Roadway Number",+ "shelf_number": "Shelf Number",+ "stocking_area": "Stocking Area",+ "tag_number": "Tag Number",+ "warehourseSelectModal": "Location Select Modal",+ "warehouseSetting": "Warehouse Setting",+ "warehouse_name": "Warehouse Name"+ }+ },+ "homepage": {+ "subTitle": "Modern Warehouse Management System"+ },+ "login": {+ "loginSuccess": "Login succeeded!",+ "mainButtonLabel": "Login",+ "notAuthority": "Undistributed menu access the account, please contact the administrator to add it!",+ "password": "Password",+ "register": "Register",+ "registerTips": "No account? Click here to register!",+ "rememberTips": "Remember me",+ "userName": "UserName",+ "welcomeTitle": "Welcome to ModernWMS!👋🏻"+ },+ "router": {+ "sideBar": {+ "asnStatistic": "Receiving statistics",+ "baseModule": "Basic Settings",+ "commodityCategorySetting": "Commodity Category",+ "commodityManagement": "Commodity Management",+ "companySetting": "Company Information",+ "customer": "Customer Info",+ "deliveryManagement": "Delivery Management",+ "deliveryStatistic": "Shipment statistics",+ "freightSetting": "Freight Setting",+ "homepage": "Home Page",+ "menuBasicSettings": "Menu",+ "ownerOfCargo": "Owner Information",+ "print": "Print Settings",+ "roleMenu": "Permission settings",+ "saftyStock": "Safety Stock",+ "statisticAnalysis": "Statistic Analysis",+ "stockAsn": "Receiving Management",+ "stockManagement": "Stock Management",+ "supplier": "Supplier Info",+ "userManagement": "User Management",+ "userRoleSetting": "User Role",+ "vwms": "Visual warehouse",+ "warehouseAdjust": "Inventory Adjust",+ "warehouseFreeze": "Inventory freeze",+ "warehouseMove": "Inventory Move",+ "warehouseProcessing": "Warehouse Processing",+ "warehouseSetting": "Warehouse Setting",+ "warehouseTaking": "Inventory Take",+ "warehouseWorkingModule": "Warehouse Working"+ }+ },+ "system": {+ "checkText": {+ "checkFormFail": "Operation failed. Please check the data and try again!",+ "decimal": " decimal",+ "inputDecimalMsg": " decimal places of the decimal part",+ "inputIntMsg": "decimal places of integer part",+ "integer": " integer",+ "lengthValid": "The length should be between ",+ "mustInput": "Please fill in the ",+ "mustSelect": "Please select ",+ "pleaseEnter": "Please enter "+ },+ "combobox": {+ "sex": {+ "female": "Female",+ "male": "Male"+ },+ "yesOrNo": {+ "no": "no",+ "yes": "yes"+ }+ },+ "hiprint": {+ "addScheme": "addScheme",+ "auxiliary": "auxiliary",+ "emptyScheme": "Empty Scheme",+ "field": "field",+ "hline": "horizontalLine",+ "oval": "oval",+ "rect": "rectangle",+ "repeatScheme": "SchemeName Is Repeat",+ "routine": "routine",+ "schemeName": "schemeName",+ "text": "text",+ "vline": "verticalLine"+ },+ "homeHeader": {+ "changePwd": "Change Password",+ "confrimNewPwd": "Confirm new password",+ "log": "System log",+ "logout": "Logout",+ "newPwd": "New password",+ "oldPwd": "Old password"+ },+ "hookComponent": {+ "dialog": {+ "defaultClose": "Close",+ "defaultConfirm": "Agree",+ "defaultTitle": "Tips"+ }+ },+ "page": {+ "add": "Add",+ "chooseFile": "Choose File",+ "close": "Close",+ "confirm": "Confirm",+ "delete": "Delete",+ "edit": "Edit",+ "export": "Export",+ "exportTemplate": "Export Template",+ "gridColumnGap": "Column spacing(px)",+ "gridRowGap": "Row spacing(px)",+ "import": "Import",+ "insertOneRow": "Insert One Row",+ "noData": "No data",+ "operate": "Operate",+ "preView": "preView",+ "preview": "preview",+ "print": "Print",+ "refresh": "Refresh",+ "reset": "Reset",+ "revoke": "Revoke",+ "rowsNumber": "Number placed per row",+ "submit": "Submit",+ "update": "Update",+ "view": "View",+ "setSearch": "Set query criteria",+ "chart": "Chart",+ "table": "Table"+ },+ "pager": {+ "goTo": "Go to",+ "pageSizes": "/page",+ "record": "record",+ "total": "Total"+ },+ "tips": {+ "beforeAsnConfirm": "Confirm Arrival?",+ "beforeAsnSorted": "Confirm Sorted?",+ "beforeAsnUnload": "Confirm Unload?",+ "beforeDeleteDetailMessage": "Are you sure you want to delete this row?",+ "beforeDeleteMessage": "Do you want to delete this data?",+ "beforeOperation": "Are you sure to proceed?",+ "detailHasItemRepeat": "The details contain duplicate items!",+ "detailLengthIsZero": "Details verification before document submission!",+ "fail": " fail!",+ "noData": "no data",+ "requestFail": "Request fail.Please try it again",+ "requestTimeout": "Request Timeout!",+ "success": " success!",+ "vaildEmail": "Please enter the correct email format!",+ "verifyPwd": "Verification failed. The new password is different from the confirmed one!",+ "setSearchError": "Setting failed! The number of query criteria should be between 1-3",+ "dataExpirationAutoRefresh": "Operation failed! The data has expired and has been automatically refreshed for you",+ "dataExpiration": "Operation failed! The data has expired, please refresh and try again"+ },+ "viewLog": {+ "action_content": "Operation content",+ "action_time": "Time",+ "user_name": "Operator"+ }+ },+ "wms": {+ "deliveryManagement": {+ "NoItemSelected": "Please select at least one commodity to delivered!",+ "ViewInventoryDetails": "View product details",+ "arrival_city": "City of arrival",+ "backToThePreviousStep": "Recall to previous process",+ "bar_code": "Bar Code",+ "carrier": "Carrier",+ "confirmBack": "Confirm withdrawal",+ "confirmDelivery": "Confirm Delivery",+ "confirmOrder": "Confirm Shipment Doc",+ "confirmPicking": "Confirm Picking",+ "confirmSignIn": "Confirm Signing",+ "confirmSuccess": "Confirm the shipment order successfully!",+ "create_time": "Creation Time",+ "creator": "Created By",+ "customer_name": "Customer Name",+ "damagedQuantity": "Damaged quantity upon arrival",+ "delivery": "Delivery",+ "deliveryReady": "Deliveryed",+ "deliveryTodo": "Undelivery",+ "departure_city": "Originating city",+ "detailQty": "Quantity",+ "detailQuantityIsZero": "Shipment quantity cannot be 0",+ "detailVolume": "Volume",+ "detailWeight": "Weight",+ "dispatch_no": "Shipment No",+ "dispatch_status": "Shipment Doc Status",+ "exceedingQuantity": "Cannot exceed the total quantity",+ "goodsToBePicked": "To Be Picked",+ "incorrectStatusMsg": "Operation failed, the status should be",+ "invalidValue": "Please enter a valid value",+ "irreversible": "This operation is irreversible",+ "newShipment": "New Shipment",+ "opeartionCheckboxIsNull": "No actionable data selected!",+ "or": " or ",+ "orderDetail": "Shipment Order Product Details",+ "order_qty": "Order Quantity",+ "outOfWarehouse": "Delivered",+ "package": "Pack",+ "packageReady": "Packaged",+ "packageTodo": "Unpacked",+ "package_no": "Packaging serial No",+ "package_person": "Packer",+ "package_qty": "Packed Quantity",+ "package_time": "Packaging Time",+ "packaged": "Packaged",+ "picked": "Picked",+ "picked_qty": "Picked Quantity",+ "preShipment": "Pre Shipment",+ "qty": "Total Quantity",+ "qty_available": "Available Quantity",+ "quantityIsZero": "Please ensure that at least one of the selected goods has an issue quantity greater than 0!",+ "quantityOverflow": "The sum of shipment quantity cannot exceed the shipment document quantity",+ "setFreight": "Set Carrier",+ "shipment": "Invoice",+ "signIn": "Sign In",+ "signInQty": "Actual signed in quantity",+ "signedIn": "Signed In",+ "sku_code": "Specification Code",+ "sku_name": "Specification Name",+ "spu_code": "Commodity Code",+ "spu_description": "Product Description",+ "spu_name": "Commodity Name",+ "state": "State",+ "toBeDelivered": "To Be Delivered",+ "toBePackaged": "To Be Packaged",+ "toBeWeighed": "To Be Weighed",+ "unit": "Commodity Unit",+ "unpackage_qty": "Quantity to be packaged",+ "unpicked_qty": "Quantity to be picked",+ "unweighing_qty": "Quantity to be weighed",+ "validQtyMsgPackage": "Please enter a valid value, which cannot exceed the total quantity",+ "validQtyMsgSignIn": "Please enter a valid value",+ "volume": "Total Volume",+ "warehouse_name": "Warehouse name",+ "waybill_no": "Waybill No",+ "weigh": "Weigh",+ "weighReady": "Weighed",+ "weighTodo": "Unweighed",+ "weighed": "Weighed",+ "weighing_no": "Weighing sheet No",+ "weighing_person": "Weigher",+ "weighing_weight": "Weighing Weight",+ "weight": "Total Weight"+ },+ "deliveryBatchAllocation": {+ "dateFrom": "Time from",+ "dateTo": "Time to",+ "allocationRule": "Allocation rules",+ "startAllocation": "Start allocation"+ },+ "deliveryStatistic": {+ "amount": "amount",+ "amount_money": "Amount of money",+ "category_name": "merchandise categories",+ "customer_name": "Customer Name",+ "delivery_date": "Delivery time",+ "delivery_qty": "Delivery quantity",+ "dispatch_no": "Shipment No",+ "goods_owner_name": "Goods owner name",+ "location_name": "Location Code",+ "series_number": "Serial number",+ "sku_code": "Specification Code",+ "sku_name": "Specification Name",+ "spu_code": "Commodity Code",+ "spu_name": "Commodity Name",+ "warehouse_name": "Warehouse name",+ "delivery_date_from": "Delivery time from",+ "delivery_date_to": "Delivery time to"+ },+ "saftyStock": {+ "qty": "Quantity",+ "qty_available": "Available quantity",+ "qty_frozen": "Frozen Quantity",+ "qty_locked": "Locked Quantity",+ "safety_stock_qty": "Safety stock quantity",+ "sku_code": "Specification Code",+ "sku_id": "Identifying",+ "sku_name": "Specification Name",+ "spu_code": "Commodity Code",+ "spu_name": "Commodity Name",+ "warehouse_name": "Warehouse name"+ },+ "skuInfo": {+ "bar_code": "Specification Code",+ "brand": "Brand",+ "category_id": "Commodity Category ID",+ "category_name": "Commodity Category",+ "cost": "Commodity Cost",+ "height": "Commodity Height",+ "lenght": "Commodity Length",+ "length_unit": "Length Unit",+ "origin": "origin",+ "price": "Commodity Price",+ "sku_code": "Specification code",+ "sku_id": "Sku Id",+ "sku_name": "Form Name",+ "spu_code": "Commodity code",+ "spu_description": "Commodity Description",+ "spu_id": "Spu Id",+ "spu_name": "Trade name",+ "supplier_id": "Supplier Id",+ "supplier_name": "Supplier Name",+ "unit": "Commodity Unit",+ "volume": "Commodity Volume",+ "volume_unit": "Volume Unit",+ "weight": "Commodity Weight",+ "weight_unit": "Weight Unit",+ "width": "Commodity Width"+ },+ "stock": {+ "location_name": "Location Code",+ "qty_available": "Available Qty",+ "skuSelectModal": "Commodity Select Modal",+ "stockSelectModal": "Stock Select Modal",+ "warehouse": "Warehouse Name"+ },+ "stockAsn": {+ "tabNotice": "Notice Of Arrival",+ "tabReceiptDetails": "Receipt Details",+ "tabToDoArrival": "To Be Delivered",+ "tabToDoGrounding": "To Be Put On The Shelf",+ "tabToDoSorting": "To Be Sorted",+ "tabToDoUnload": "To Be Unloaded"+ },+ "stockAsnInfo": {+ "actual_qty": "Actual Quantity",+ "addSorting": "Sorting",+ "arrival_time": "Arrival time",+ "asn_batch": "Batch",+ "asn_no": "Asn No",+ "asn_qty": "Asn Quantity",+ "asn_status": "Asn Status",+ "can_putaway_qty": "Quantity available for listing",+ "confirmArrival": "Confirm arrival",+ "confirmUnload": "Confirm unloading",+ "damage_qty": "Damage Quantity",+ "editGrounding": "Edit",+ "editSorting": "Edit",+ "estimated_arrival_time": "Estimated time of arrival",+ "exceedTip": "The number of listings cannot exceed the number of listings available!",+ "exceedingPrompt": "The number of serial numbers cannot exceed the sorting quantity!",+ "goods_owner_id": "Goods Owner Id",+ "goods_owner_name": "Goods Owner Name",+ "grounding": "grounding",+ "id": "ID",+ "is_valid": "Valid",+ "length_unit": "Length Unit",+ "more_qty": "More Quantity",+ "mustInputErrorMsg": "Please fill in the arrival time!",+ "notLocation": "Please select a storage location before listing!",+ "num": "number",+ "origin": "Origin",+ "putaway_qty": "Number of listings",+ "revoke": "Revoke",+ "selectLocation": "Select location code",+ "selectOne": "Please select at least one piece of data!",+ "series_number": "Serial number",+ "shortage_qty": "Shortage Quantity",+ "sku_code": "Specification code",+ "sku_id": "Sku Id",+ "sku_name": "Form Name",+ "sorted_qty": "Sorted Quantity",+ "spu_code": "Commodity code",+ "spu_id": "Spu Id",+ "spu_name": "Trade name",+ "supplier_id": "Supplier Id",+ "supplier_name": "Supplier Name",+ "unloadPerson": "Discharger",+ "unloadTime": "Unloading time",+ "viewDetail": "View Details",+ "volume": "Volume",+ "volume_unit": "Volume Unit",+ "weight": "Weight",+ "weight_unit": "Weight Unit"+ },+ "stockList": {+ "qty": "Quantity",+ "qty_asn": "Asn Quantity",+ "qty_available": "Available Quantity",+ "qty_frozen": "Frozen Quantity",+ "qty_locked": "Locked Quantity",+ "qty_sorted": "Sorted Quantity",+ "qty_to_sort": "Sort Quantity",+ "qty_to_unload": "Unload Quantity",+ "shortage_qty": "Shortage Quantity",+ "sku_code": "Specification code",+ "sku_id": "Sku Id",+ "spu_code": "Commodity code",+ "spu_name": "Trade name"+ },+ "stockLocation": {+ "location_name": "Location Code",+ "qty": "Quantity",+ "qty_available": "Available Quantity",+ "qty_frozen": "Frozen Quantity",+ "qty_locked": "Locked Quantity",+ "series_number": "Serial number",+ "sku_code": "Specification code",+ "sku_id": "Sku Id",+ "sku_name": "Form Name",+ "spu_code": "Commodity code",+ "spu_name": "Trade name",+ "warehouse_name": "Warehouse"+ },+ "stockManagement": {+ "stock": "Stock",+ "stockLocation": "Stock Location"+ },+ "warehouseWorking": {+ "warehouseAdjust": {+ "beforeConfirmAdjust": "Are you sure to adjust this data?",+ "confirmAdjust": "Confirm Adjust",+ "create_time": "Create Time",+ "creator": "Creator",+ "handle_time": "Handle Time",+ "handler": "Handler",+ "job_code": "Job Code",+ "job_type": "Job Type",+ "location_name": "Location Code",+ "processCombine": "Warehouse Process",+ "processSplit": "Warehouse Process",+ "qty": "Difference Qty",+ "warehouse": "Warehouse",+ "warehouseMove": "Warehouse Move",+ "warehouseTake": "Warehouse Take"+ },+ "warehouseFreeze": {+ "create_time": "Create Time",+ "creator": "Creator",+ "freeze": "Freeze",+ "handle_time": "Handle Time",+ "handler": "Handler",+ "job_code": "Job Code",+ "job_type": "Job Type",+ "location_name": "Location Code",+ "unfreeze": "Unfreeze",+ "warehouse": "Warehouse"+ },+ "warehouseMove": {+ "adjusted": "Adjusted",+ "beforeConfirmMove": "Are you sure to move this data?",+ "confirmMove": "Confirm Move",+ "create_time": "Create Time",+ "creator": "Creator",+ "dest_googs_location_name": "Target Location",+ "dest_googs_warehouse": "Target Warehouse",+ "handle_time": "Handle Time",+ "handler": "Handler",+ "job_code": "Job No",+ "move_status": "Move Status",+ "orig_goods_location_name": "Origin Location",+ "orig_goods_warehouse": "Origin Warehouse",+ "qty": "Qty",+ "unadjust": "Unadjust"+ },+ "warehouseProcessing": {+ "adjust_status": "Is Updated Stock",+ "alreadyAdjust": "The data can't delete because it had been adjusted",+ "alreadyProcess": "The data can't delete because it had been processed",+ "beforeConfirmAdjust": "Are you sure to adjust this data?",+ "beforeConfirmProcess": "Are you sure to process this data?",+ "confirmAdjust": "Confirm Adjust",+ "confirmProcess": "Confirm Process",+ "create_time": "Create Time",+ "creator": "Creator",+ "is_source": "Is Source",+ "is_update_stock": "Is Updated Stock",+ "job_code": "Job Code",+ "job_type": "Job Type",+ "last_update_time": "Last Update Time",+ "process_combine": "Combine Processing",+ "process_split": "Split Processing",+ "process_status": "Process Status",+ "process_time": "Process Time",+ "processor": "Processor",+ "qty": "Qty",+ "qtyMoreThanAvailable": "Can't more than the number of Available",+ "sku_code": "Specification Code",+ "sku_name": "Specification Name",+ "source": "Source",+ "spu_code": "Commodity Code",+ "spu_name": "Commodity Name",+ "target": "Target",+ "target_location": "Target Location",+ "target_warehouse": "Target Warehouse",+ "unit": "Unit"+ },+ "warehouseTaking": {+ "addFromCommodity": "Choose From Commodity",+ "addFromStock": "Choose From Inventory",+ "addTips": "You can choose goods and the location to add a new record when there is no target inventory",+ "beforeConfirmAdjust": "Are you sure to adjust this data?",+ "book_qty": "Book Qty",+ "confirmAdjust": "Confirm Adjust",+ "confirmTaking": "Confirm Taking",+ "counted_qty": "Actual Qty",+ "create_time": "Create Time",+ "creator": "Creator",+ "difference_qty": "Difference Qty",+ "finish": "Finish",+ "handle_time": "Handle Time",+ "handler": "Handler",+ "job_code": "Job Code",+ "job_status": "Job Status",+ "location_name": "Location Code",+ "unfinish": "Unfinish",+ "warehouse": "Warehouse"+ }+ }+ }+}diff --git a/frontend/src/languages/langsJson/tw.json b/frontend/src/languages/langsJson/tw.jsonnew file mode 100644index 0000000..66203fe--- /dev/null+++ b/frontend/src/languages/langsJson/tw.json@@ -0,0 +1,736 @@+{+ "base": {+ "commodityCategorySetting": {+ "category_name": "商品類別",+ "create_time": "創建時間",+ "creator": "創建人",+ "parent_name": "所屬類別"+ },+ "commodityManagement": {+ "bar_code": "商品條碼",+ "brand": "品牌",+ "category_name": "商品類別",+ "cost": "商品成本",+ "height": "商品高度",+ "lenght": "商品長度",+ "length_unit": "長度單位",+ "origin": "產地",+ "price": "商品價格",+ "printBarCode": "列印條碼",+ "printQrCode": "列印二維碼",+ "print_data_detail": "明細數據",+ "print_data_main": "數據清單",+ "print_page_detail": "商品管理",+ "print_page_main": "商品管理-清單",+ "saftyStock": "安全庫存",+ "sku_code": "規格編碼",+ "sku_name": "規格名稱",+ "spu_code": "商品編碼",+ "spu_description": "商品描述",+ "spu_name": "商品名稱",+ "supplier_name": "供應商名稱",+ "unit": "商品單位",+ "volume": "商品體積",+ "volume_unit": "體積單位",+ "weight": "商品重量",+ "weight_unit": "重量單位",+ "width": "商品寬度"+ },+ "companySetting": {+ "address": "詳細地址",+ "city": "所在城市",+ "company_name": "公司名稱",+ "contact_tel": "聯繫方式",+ "manager": "負責人"+ },+ "customer": {+ "address": "詳細地址",+ "city": "所在城市",+ "contact_tel": "聯繫方式",+ "create_time": "創建時間",+ "creator": "創建人",+ "customer_name": "客戶名稱",+ "email": "Email",+ "is_valid": "是否有效",+ "last_update_time": "最後更新時間",+ "manager": "負責人",+ "print_data_main": "數據清單",+ "print_page_detail": "客戶資訊",+ "print_page_main": "客戶資訊-清單"+ },+ "freightSetting": {+ "arrival_city": "到貨城市",+ "carrier": "承運商",+ "create_time": "創建時間",+ "creator": "創建人",+ "departure_city": "始發城市",+ "freightSelectModal": "運費選擇框",+ "is_valid": "是否有效",+ "last_update_time": "最後更新時間",+ "min_payment": "最小運費",+ "price_per_volume": "單立方米運費",+ "price_per_weight": "單公斤運費"+ },+ "ownerOfCargo": {+ "address": "詳細地址",+ "city": "所在城市",+ "contact_tel": "聯繫方式",+ "create_time": "創建時間",+ "creator": "創建人",+ "goods_owner_name": "貨主名稱",+ "manager": "負責人"+ },+ "printSolution": {+ "detailList": "明細數據",+ "solution_name": "方案名稱",+ "tab_page": "頁面名稱",+ "vue_path": "選單名稱"+ },+ "roleMenu": {+ "beforeUpdateOrDel": "請先選擇需要處理的資料!",+ "dataEmpty": "暫無權限",+ "expandRow": "展開行",+ "menu_name": "菜單名稱",+ "modalTitle": {+ "actionTitle": "操作權限",+ "editMenuAction": "編輯選單操作权限"+ },+ "opeartionFunctionName": {+ "deliveryManagement": {+ "delivered": "出庫",+ "invoice": "發貨單",+ "packaged": "打包",+ "picked": "撿貨",+ "signedIn": "已簽收",+ "weighed": "秤重"+ },+ "stockAsn": {+ "delivered": "待到貨",+ "detail": "收貨明細",+ "notice": "到貨通知",+ "putOnTheShelf": "待上架",+ "sorted": "待分揀",+ "unloaded": "待卸貨"+ },+ "stockManagement": {+ "area": "庫位列表",+ "stock": "庫存列表"+ },+ "warehouseSetting": {+ "area": "庫區設置",+ "location": "庫位設置",+ "warehouse": "倉庫設置"+ }+ },+ "operation": "操作權限",+ "operationTitle": {+ "add": "新增",+ "confirm": "確認操作",+ "confirmAdjust": "確認調整",+ "confirmOpeartion": "確認操作",+ "delete": "刪除",+ "delivery": "出庫",+ "editArrival": "編輯上架數量",+ "editCount": "編輯數量",+ "export": "匯出",+ "freeze": "凍結",+ "group": "組合加工",+ "import": "匯入",+ "package": "打包",+ "printBarCode": "列印條碼",+ "printQrCode": "列印二維碼",+ "refresh": "更新",+ "resetPwd": "重置密碼",+ "revoke": "撤回",+ "saftyStock": "安全庫存",+ "save": "保存",+ "setCarrier": "設置承運單位",+ "signIn": "簽收",+ "split": "拆分加工",+ "stock": "庫存",+ "unfreeze": "解除",+ "weigh": "秤重"+ },+ "role_name": "角色名稱"+ },+ "supplier": {+ "address": "詳細地址",+ "city": "所在城市",+ "contact_tel": "聯繫方式",+ "create_time": "創建時間",+ "creator": "創建人",+ "email": "Email",+ "is_valid": "是否有效",+ "last_update_time": "最後更新時間",+ "manager": "負責人",+ "supplier_name": "供應商名稱"+ },+ "userManagement": {+ "addSuccessTip": "新增成功, 使用者初始密碼為: ",+ "afterResetPwd": "重置密碼成功, 新密碼為: ",+ "auth_string": "密碼",+ "beforeResetPwd": "您確定要重置這些使用者的密碼嗎?",+ "checkboxIsNull": "請選中數據!",+ "contact_tel": "聯繫方式",+ "email": "Email",+ "is_valid": "是否有效",+ "restPwd": "重置密碼",+ "sex": "性别",+ "userModalTitle": "用戶選擇框",+ "user_name": "員工名稱",+ "user_num": "員工編號",+ "user_register_name": "用戶名",+ "user_role": "角色"+ },+ "userRoleSetting": {+ "is_valid": "是否有效",+ "role_name": "用戶角色"+ },+ "warehouseSetting": {+ "address": "詳細地址",+ "area_name": "庫區名稱",+ "area_property": "庫區類型",+ "city": "所在城市",+ "contact_tel": "聯繫方式",+ "create_time": "創建時間",+ "creator": "創建人",+ "defective_area": "次品區",+ "email": "Email",+ "inventory_area": "存貨區",+ "is_valid": "是否有效",+ "last_update_time": "最後更新時間",+ "layer_number": "層號",+ "locationSelectModal": "庫位選擇框",+ "locationSetting": "庫位設置",+ "location_heigth": "庫位高(m)",+ "location_length": "庫位長(m)",+ "location_load": "庫位承重(kg)",+ "location_name": "儲位編碼",+ "location_volume": "庫位容積(m³)",+ "location_width": "庫位寬(m)",+ "manager": "負責人",+ "picking_area": "揀貨區",+ "receiving_area": "收貨區",+ "reservoirSetting": "庫區設置",+ "return_area": "退貨區",+ "roadway_number": "巷道號",+ "shelf_number": "貨架號",+ "stocking_area": "備貨區",+ "tag_number": "位號",+ "warehourseSelectModal": "庫位選擇框",+ "warehouseSetting": "倉庫設置",+ "warehouse_name": "倉庫名稱"+ }+ },+ "homepage": {+ "subTitle": "現代化倉庫管理系統"+ },+ "login": {+ "loginSuccess": "登入成功",+ "mainButtonLabel": "登入",+ "notAuthority": "該帳號未設定功能權限,請聯繫管理員",+ "password": "密碼",+ "register": "註冊",+ "registerTips": "沒有帳號?點此註冊一個!",+ "rememberTips": "記住帳號密碼",+ "userName": "用戶名",+ "welcomeTitle": "歡迎來到ModernWMS!👋🏻"+ },+ "router": {+ "sideBar": {+ "asnStatistic": "收貨統計",+ "baseModule": "基礎設置",+ "commodityCategorySetting": "商品類別設置",+ "commodityManagement": "商品管理",+ "companySetting": "公司資訊",+ "customer": "客戶資訊",+ "deliveryManagement": "發貨管理",+ "deliveryStatistic": "發貨統計",+ "freightSetting": "運費設置",+ "homepage": "首頁",+ "menuBasicSettings": "功能基礎設置",+ "ownerOfCargo": "貨主信息",+ "print": "列印設定",+ "roleMenu": "功能設置",+ "saftyStock": "安全庫存",+ "statisticAnalysis": "統計分析",+ "stockAsn": "收貨管理",+ "stockManagement": "庫存管理",+ "supplier": "供應商資訊",+ "userManagement": "用戶管理",+ "userRoleSetting": "角色設置",+ "vwms": "視覺化倉庫",+ "warehouseAdjust": "庫存調整",+ "warehouseFreeze": "庫存凍結",+ "warehouseMove": "庫存移動",+ "warehouseProcessing": "倉內加工",+ "warehouseSetting": "倉庫設置",+ "warehouseTaking": "庫存盤點",+ "warehouseWorkingModule": "倉內作業"+ }+ },+ "system": {+ "checkText": {+ "checkFormFail": "操作失敗, 請檢查資料後重試!",+ "decimal": " 小數",+ "inputDecimalMsg": "的小數位",+ "inputIntMsg": "的整數位元",+ "integer": "整數",+ "lengthValid": "欄位長度應該在",+ "mustInput": "請填寫",+ "mustSelect": "請選擇",+ "pleaseEnter": "請輸入長度為"+ },+ "combobox": {+ "sex": {+ "female": "女",+ "male": "男"+ },+ "yesOrNo": {+ "no": "否",+ "yes": "是"+ }+ },+ "hiprint": {+ "addScheme": "新增方案",+ "auxiliary": "輔助",+ "emptyScheme": "不存在方案",+ "field": "欄位",+ "hline": "橫線",+ "oval": "橢圓",+ "rect": "矩形",+ "repeatScheme": "方案名稱已存在",+ "routine": "常規",+ "schemeName": "方案名稱",+ "text": "文字",+ "vline": "分隔號"+ },+ "homeHeader": {+ "changePwd": "修改密碼",+ "confrimNewPwd": "確認新密碼",+ "log": "系統日誌",+ "logout": "註銷",+ "newPwd": "新密碼",+ "oldPwd": "舊密碼"+ },+ "hookComponent": {+ "dialog": {+ "defaultClose": "關閉",+ "defaultConfirm": "確認",+ "defaultTitle": "提示"+ }+ },+ "page": {+ "add": "新增",+ "chooseFile": "選擇檔案",+ "close": "關閉",+ "confirm": "確認",+ "delete": "刪除",+ "edit": "編輯",+ "export": "匯出",+ "exportTemplate": "匯出範本",+ "gridColumnGap": "列間距(px)",+ "gridRowGap": "行間距(px)",+ "import": "匯入",+ "insertOneRow": "新增一行",+ "noData": "暫無數據",+ "operate": "操作",+ "preView": "預覽",+ "preview": "預覽",+ "print": "列印",+ "refresh": "更新",+ "reset": "重置",+ "revoke": "撤回",+ "rowsNumber": "每行放置數量",+ "submit": "提交",+ "update": "修改",+ "view": "查看",+ "setSearch": "設定查詢準則",+ "chart": "圖表",+ "table": "表格"+ },+ "pager": {+ "goTo": "前往",+ "pageSizes": "條/頁",+ "record": "條記錄",+ "total": "共"+ },+ "tips": {+ "beforeAsnConfirm": "確認到貨?",+ "beforeAsnSorted": "確認分揀完成?",+ "beforeAsnUnload": "確認卸貨?",+ "beforeDeleteDetailMessage": "您確定要刪除此行嗎?",+ "beforeDeleteMessage": "您確定要刪除此條資料嗎?",+ "beforeOperation": "您確定要進行此操作嗎?",+ "detailHasItemRepeat": "明細中含有重複專案!",+ "detailLengthIsZero": "請添加明細數據!",+ "fail": "失敗!",+ "noData": "暫無數據",+ "requestFail": "介面請求失敗,請重試",+ "requestTimeout": "請求逾時!",+ "success": "成功!",+ "vaildEmail": "請輸入正確的e-mail格式!",+ "verifyPwd": "校驗失敗, 新密碼與確認新密碼不同!",+ "setSearchError": "設定失敗! 查詢準則數量應該在1-3個之間",+ "dataExpirationAutoRefresh": "操作失敗!數據已過期,已為您自動刷新數據",+ "dataExpiration": "操作失敗!數據已過期,請重繪後重試"+ },+ "viewLog": {+ "action_content": "操作內容",+ "action_time": "操作時間",+ "user_name": "操作人"+ }+ },+ "wms": {+ "deliveryManagement": {+ "NoItemSelected": "請至少選中一項商品進行出庫!",+ "ViewInventoryDetails": "查看商品明細",+ "arrival_city": "到貨城市",+ "backToThePreviousStep": "撤回到上一個流程",+ "bar_code": "條碼",+ "carrier": "承運單位",+ "confirmBack": "確認撤回",+ "confirmDelivery": "確認出庫",+ "confirmOrder": "確認發貨單",+ "confirmPicking": "確認揀貨",+ "confirmSignIn": "確認簽收",+ "confirmSuccess": "確認發貨單成功!",+ "create_time": "創建時間",+ "creator": "創建人",+ "customer_name": "客戶名稱",+ "damagedQuantity": "到貨破損數量",+ "delivery": "出庫",+ "deliveryReady": "已出庫",+ "deliveryTodo": "未出庫",+ "departure_city": "始發城市",+ "detailQty": "數量",+ "detailQuantityIsZero": "發貨數量不能為0",+ "detailVolume": "體積",+ "detailWeight": "重量",+ "dispatch_no": "發貨單號",+ "dispatch_status": "發貨單狀態",+ "exceedingQuantity": "不能超過總數量",+ "goodsToBePicked": "待揀貨",+ "incorrectStatusMsg": "操作失敗, 狀態應該為",+ "invalidValue": "請輸入有效數值",+ "irreversible": "此操作不可逆",+ "newShipment": "新發貨",+ "opeartionCheckboxIsNull": "未選中可操作的資料!",+ "or": "或",+ "orderDetail": "發貨單商品詳情",+ "order_qty": "訂單數量",+ "outOfWarehouse": "出庫",+ "package": "打包",+ "packageReady": "已打包",+ "packageTodo": "未打包",+ "package_no": "打包流水號",+ "package_person": "打包員",+ "package_qty": "已打包數量",+ "package_time": "打包時間",+ "packaged": "打包",+ "picked": "已揀貨",+ "picked_qty": "已揀貨數量",+ "preShipment": "預發貨",+ "qty": "總數量",+ "qty_available": "可用數量",+ "quantityIsZero": "請保證選擇的商品至少有一項出庫數量大於0!",+ "quantityOverflow": "發貨數量之和不能超出發貨單數量",+ "setFreight": "設置承運單位",+ "shipment": "發貨單",+ "signIn": "簽收",+ "signInQty": "實際簽收數量",+ "signedIn": "已簽收",+ "sku_code": "規格編碼",+ "sku_name": "規格名稱",+ "spu_code": "商品編碼",+ "spu_description": "商品描述",+ "spu_name": "商品名稱",+ "state": "狀態",+ "toBeDelivered": "待出庫",+ "toBePackaged": "待打包",+ "toBeWeighed": "待秤重",+ "unit": "商品單位",+ "unpackage_qty": "待打包數量",+ "unpicked_qty": "待揀貨數量",+ "unweighing_qty": "待秤重數量",+ "validQtyMsgPackage": "請輸入有效數值, 且不能超过总数量",+ "validQtyMsgSignIn": "請輸入有效數值, 且不能超过总数量",+ "volume": "總體積",+ "warehouse_name": "倉庫名稱",+ "waybill_no": "運單號",+ "weigh": "秤重",+ "weighReady": "已秤重",+ "weighTodo": "未秤重",+ "weighed": "秤重",+ "weighing_no": "秤重單號",+ "weighing_person": "秤重員",+ "weighing_weight": "秤重重量",+ "weight": "總重量"+ },+ "deliveryBatchAllocation": {+ "dateFrom": "時間從",+ "dateTo": "時間至",+ "allocationRule": "分配規則",+ "startAllocation": "開始分配"+ },+ "deliveryStatistic": {+ "amount": "數量",+ "amount_money": "金額",+ "category_name": "商品類別",+ "customer_name": "客戶名稱",+ "delivery_date": "出庫時間",+ "delivery_qty": "出庫數量",+ "dispatch_no": "發貨單號",+ "goods_owner_name": "貨主名稱",+ "location_name": "庫位名稱",+ "series_number": "SN號",+ "sku_code": "規格編碼",+ "sku_name": "規格名稱",+ "spu_code": "商品編碼",+ "spu_name": "商品名稱",+ "warehouse_name": "倉庫名稱",+ "delivery_date_from": "出庫時間從",+ "delivery_date_to": "出庫時間至"+ },+ "saftyStock": {+ "qty": "數量",+ "qty_available": "可用數量",+ "qty_frozen": "凍結數量",+ "qty_locked": "鎖定數量",+ "safety_stock_qty": "安全庫存數量",+ "sku_code": "規格編碼",+ "sku_id": "規格標識",+ "sku_name": "規格名稱",+ "spu_code": "商品編碼",+ "spu_name": "商品名稱",+ "warehouse_name": "倉庫名稱"+ },+ "skuInfo": {+ "bar_code": "商品條碼",+ "brand": "品牌",+ "category_id": "商品類別標識",+ "category_name": "商品類別",+ "cost": "商品成本",+ "height": "商品高度",+ "lenght": "商品長度",+ "length_unit": "長度單位",+ "origin": "產地",+ "price": "商品價格",+ "sku_code": "規格編碼",+ "sku_id": "規格標識",+ "sku_name": "規格名稱",+ "spu_code": "商品編碼",+ "spu_description": "商品描述",+ "spu_id": "商品spu標識",+ "spu_name": "商品名稱",+ "supplier_id": "供應商標識",+ "supplier_name": "供應商名稱",+ "unit": "商品單位",+ "volume": "商品體積",+ "volume_unit": "體積單位",+ "weight": "總重量",+ "weight_unit": "重量單位",+ "width": "商品寬度"+ },+ "stock": {+ "location_name": "儲位編碼",+ "qty_available": "可用數量",+ "skuSelectModal": "商品選擇框",+ "stockSelectModal": "庫存選擇框",+ "warehouse": "倉庫名稱"+ },+ "stockAsn": {+ "tabNotice": "到貨通知",+ "tabReceiptDetails": "收貨明細",+ "tabToDoArrival": "待到貨",+ "tabToDoGrounding": "待上架",+ "tabToDoSorting": "待分揀",+ "tabToDoUnload": "待卸貨"+ },+ "stockAsnInfo": {+ "actual_qty": "上架數量",+ "addSorting": "分揀",+ "arrival_time": "到達時間",+ "asn_batch": "批次",+ "asn_no": "到貨通知書編號",+ "asn_qty": "到貨通知書數據",+ "asn_status": "到貨通知書狀態",+ "can_putaway_qty": "可上架數量",+ "confirmArrival": "確認到貨",+ "confirmUnload": "確認卸貨",+ "damage_qty": "破損數量",+ "editGrounding": "編輯",+ "editSorting": "編輯",+ "estimated_arrival_time": "預計到達時間",+ "exceedTip": "上架數量不可超過可上架數量!",+ "exceedingPrompt": "序號數量不能超過分揀數量!",+ "goods_owner_id": "貨主標識",+ "goods_owner_name": "貨主名稱",+ "grounding": "上架",+ "id": "標識",+ "is_valid": "是否有效",+ "length_unit": "長度單位",+ "more_qty": "超量數量",+ "mustInputErrorMsg": "請填寫到貨時間!",+ "notLocation": "請選擇儲位後進行上架!",+ "num": "編號",+ "origin": "產地",+ "putaway_qty": "上架數量",+ "revoke": "撤銷",+ "selectLocation": "選擇儲位編碼",+ "selectOne": "請至少選擇一條資料!",+ "series_number": "SN號",+ "shortage_qty": "短少數量",+ "sku_code": "規格編碼",+ "sku_id": "商品sku標識",+ "sku_name": "規格名稱",+ "sorted_qty": "分揀數量",+ "spu_code": "商品編碼",+ "spu_id": "商品spu標識",+ "spu_name": "商品名稱",+ "supplier_id": "供應商標識",+ "supplier_name": "供應商名稱",+ "unloadPerson": "卸貨人",+ "unloadTime": "卸貨時間",+ "viewDetail": "查看明細",+ "volume": "總體積",+ "volume_unit": "體積單位",+ "weight": "總重量",+ "weight_unit": "重量單位"+ },+ "stockList": {+ "qty": "數量",+ "qty_asn": "到貨通知書數量",+ "qty_available": "可用數量",+ "qty_frozen": "凍結數量",+ "qty_locked": "鎖定數量",+ "qty_sorted": "已分揀數量",+ "qty_to_sort": "待分揀數量",+ "qty_to_unload": "待卸貨數量",+ "shortage_qty": "欠貨數量",+ "sku_code": "規格編碼",+ "sku_id": "規格標識",+ "spu_code": "商品編碼",+ "spu_name": "商品名稱"+ },+ "stockLocation": {+ "location_name": "庫位名稱",+ "qty": "數量",+ "qty_available": "可用數量",+ "qty_frozen": "凍結數量",+ "qty_locked": "鎖定數量",+ "series_number": "SN號",+ "sku_code": "規格編碼",+ "sku_id": "規格標識",+ "sku_name": "規格名稱",+ "spu_code": "商品編碼",+ "spu_name": "商品名稱",+ "warehouse_name": "倉庫名稱"+ },+ "stockManagement": {+ "stock": "庫存列表",+ "stockLocation": "庫位列表"+ },+ "warehouseWorking": {+ "warehouseAdjust": {+ "beforeConfirmAdjust": "您確認對該條資料進行調整嗎?",+ "confirmAdjust": "確認調整",+ "create_time": "創建時間",+ "creator": "創建人",+ "handle_time": "操作時間",+ "handler": "操作人",+ "job_code": "作業單號",+ "job_type": "作業類型",+ "location_name": "所在庫位",+ "processCombine": "倉內加工",+ "processSplit": "倉內加工",+ "qty": "調整差異數量",+ "warehouse": "所在倉庫",+ "warehouseMove": "移庫",+ "warehouseTake": "盤點"+ },+ "warehouseFreeze": {+ "create_time": "創建時間",+ "creator": "創建人",+ "freeze": "凍結",+ "handle_time": "操作時間",+ "handler": "操作人",+ "job_code": "作業單號",+ "job_type": "作業類型",+ "location_name": "所在庫位",+ "unfreeze": "解除",+ "warehouse": "所在倉庫"+ },+ "warehouseMove": {+ "adjusted": "已調整",+ "beforeConfirmMove": "您確認對該條資料進行移庫嗎?",+ "confirmMove": "確認移庫",+ "create_time": "創建時間",+ "creator": "創建人",+ "dest_googs_location_name": "目標儲位",+ "dest_googs_warehouse": "目標倉庫",+ "handle_time": "操作時間",+ "handler": "操作人",+ "job_code": "作業單號",+ "move_status": "作業狀態",+ "orig_goods_location_name": "來源儲位",+ "orig_goods_warehouse": "來源倉庫",+ "qty": "數量",+ "unadjust": "未調整"+ },+ "warehouseProcessing": {+ "adjust_status": "是否已調整",+ "alreadyAdjust": "該資料已完成調整,不可刪除",+ "alreadyProcess": "該資料已完成加工,不可刪除",+ "beforeConfirmAdjust": "您確認對該條資料進行調整嗎?",+ "beforeConfirmProcess": "您確認對該條資料進行加工嗎?",+ "confirmAdjust": "確認調整",+ "confirmProcess": "確認加工",+ "create_time": "創建時間",+ "creator": "創建人",+ "is_source": "是否來源商品",+ "is_update_stock": "是否已更新庫存",+ "job_code": "作業單號",+ "job_type": "作業類型",+ "last_update_time": "最後更新時間",+ "process_combine": "組合加工",+ "process_split": "拆分加工",+ "process_status": "加工狀態",+ "process_time": "操作時間",+ "processor": "操作人",+ "qty": "數量",+ "qtyMoreThanAvailable": "不可超過可用數量",+ "sku_code": "規格編碼",+ "sku_name": "規格名稱",+ "source": "來源",+ "spu_code": "商品編碼",+ "spu_name": "商品名稱",+ "target": "目標",+ "target_location": "目標儲位",+ "target_warehouse": "目標倉庫",+ "unit": "商品單位"+ },+ "warehouseTaking": {+ "addFromCommodity": "選擇商品",+ "addFromStock": "選擇庫存",+ "addTips": "當目標庫存不存在時,可通過手動選擇商品和儲位來新增記錄",+ "beforeConfirmAdjust": "您確認對該條資料進行調整嗎?",+ "book_qty": "帳面數量",+ "confirmAdjust": "確認調整",+ "confirmTaking": "確認盤點",+ "counted_qty": "盤點數量",+ "create_time": "創建時間",+ "creator": "創建人",+ "difference_qty": "差異數量",+ "finish": "已完成",+ "handle_time": "操作時間",+ "handler": "操作人",+ "job_code": "作業單號",+ "job_status": "作業狀態",+ "location_name": "所在庫位",+ "unfinish": "待作業",+ "warehouse": "所在倉庫"+ }+ }+ }+}diff --git a/frontend/src/languages/method/index.ts b/frontend/src/languages/method/index.tsindex 73ebbe0..9893f72 100644--- a/frontend/src/languages/method/index.ts+++ b/frontend/src/languages/method/index.ts@@ -1,10 +1,12 @@// Get different languages according to the key-export function getSelcectedLang(lang: string) {+export function getSelectedLang(lang: string) {switch (lang) {case 'zh':return 'zh_CN'case 'en':return 'en_US'+ case 'tw':+ return 'zh_TW'default:return 'en_US'}diff --git a/frontend/src/main.ts b/frontend/src/main.tsindex 0108050..6ce092f 100644--- a/frontend/src/main.ts+++ b/frontend/src/main.ts@@ -1,5 +1,7 @@import { createApp } from 'vue'import './style.css' // Global Styles+import print from 'vue3-print-nb'+import { setup } from 'yk-vue-plugin-hiprint'import { VXETable } from '@/plugins/VXETable/index'import { vuetify } from '@/plugins/vuetify/index'import i18n from './languages/i18n'@@ -11,11 +13,13 @@ import { store } from './store/index'import hookComponent from '@/components/system/index'const app = createApp(App)+app.config.globalProperties.hiprint = setup()VXETable.setup({i18n: (key, args) => i18n.global.t(key, args)})+app.use(print)app.use(router)app.use(store)app.use(vuetify)diff --git a/frontend/src/plugins/vuetify/index.ts b/frontend/src/plugins/vuetify/index.tsindex 3089903..982552e 100644--- a/frontend/src/plugins/vuetify/index.ts+++ b/frontend/src/plugins/vuetify/index.ts@@ -5,7 +5,7 @@ import * as components from 'vuetify/components'import * as directives from 'vuetify/directives'import { aliases, mdi } from 'vuetify/iconsets/mdi'// Translations provided by Vuetify-import { zhHans, en } from 'vuetify/locale'+import { zhHans, zhHant, en } from 'vuetify/locale'import { getSelcectedLangForVuetify } from './method/index'import 'material-design-icons-iconfont/dist/material-design-icons.css'@@ -15,7 +15,7 @@ import '@mdi/font/css/materialdesignicons.css'const vuetify = createVuetify({locale: {locale: getStorageLang(),- messages: { zhHans, en }+ messages: { zhHans, zhHant, en }},components,directives,diff --git a/frontend/src/plugins/vuetify/method/index.ts b/frontend/src/plugins/vuetify/method/index.tsindex 3a54ffa..aa7755d 100644--- a/frontend/src/plugins/vuetify/method/index.ts+++ b/frontend/src/plugins/vuetify/method/index.ts@@ -5,6 +5,8 @@ export function getSelcectedLangForVuetify(lang: string) {return 'zhHans'case 'en':return 'en'+ case 'tw':+ return 'zhHant'default:return 'en'}diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.tsindex 7becb77..ff9c752 100644--- a/frontend/src/router/index.ts+++ b/frontend/src/router/index.ts@@ -24,8 +24,17 @@ const routes: RouteRecordRaw[] = [path: '/home',redirect: 'homepage',component: () => import('@/view/home/home.vue'),- children: []- }+ children: [+ {+ name: 'vwms',+ path: '/vwms',+ component: () => import('@/view/vwms/VWms.vue'),+ meta: {+ menuPath: 'vwms'+ }+ }+ ]+ },]// create router@@ -45,13 +54,24 @@ const modules = import.meta.glob('../view/*/*/*.vue')// load router functionfunction loadRouter() {dynamicRouter = menusToRouter(store.getters['user/menulist'])- dynamicRouter.push({- name: 'homepage',- path: '/homepage',- directory: 'home/homepage',- redirect: '',- component: null- })+ dynamicRouter.push(+ {+ name: 'homepage',+ path: '/homepage',+ directory: 'home/homepage',+ redirect: '',+ component: null+ }+ )+ // dynamicRouter.push(+ // {+ // name: 'test',+ // path: '/test',+ // directory: 'test/test',+ // redirect: '',+ // component: null+ // }+ // )// Clear the loaded routes before creating them, mainly for logged out usersfor (const item of loadedRouter) {router.removeRoute(item)@@ -76,7 +96,9 @@ router.beforeEach((to, from, next) => {dynamicRouter = []return next()}-+ if (to.path === '/vwms') {+ next()+ }// dont have token, back loginif (!store.getters['user/token']) {return next('/login')diff --git a/frontend/src/shims.d.ts b/frontend/src/shims.d.tsnew file mode 100644index 0000000..40cda30--- /dev/null+++ b/frontend/src/shims.d.ts@@ -0,0 +1,2 @@+declare module '@/hiprint/index.js'+declare namespace jquery {}\ No newline at end of filediff --git a/frontend/src/store/module/user.ts b/frontend/src/store/module/user.tsindex 64a6aaa..55ef298 100644--- a/frontend/src/store/module/user.ts+++ b/frontend/src/store/module/user.ts@@ -5,15 +5,15 @@ export const user = {state: {userInfo: {},token: '',- // 用于刷新token用的串+ // String used to refresh tokenrefreshToken: '',- // token失效的时间+ // The time when the token expiresexpirationTime: '',- // token有效期+ // Token validity periodeffectiveMinutes: '',- // 当前是否正在refreshToken+ // Is refreshToken currently in progressisRefreshingToken: false,- // 菜单权限+ // Menu permissionsmenulist: [// {// name: 'testmenu',diff --git a/frontend/src/style.css b/frontend/src/style.cssindex 4943a39..82e07d2 100644--- a/frontend/src/style.css+++ b/frontend/src/style.css@@ -10,3 +10,34 @@ body {height: 100vh;width: 100vw;}++.hiprint-headerLine, .hiprint-footerLine {+ border-color: red !important;+}++.hiprint-headerLine:hover, .hiprint-footerLine:hover {+ border-top: 3px dashed red !important;+}++.hiprint-headerLine:hover:before {+ content: "页眉线";+ left: calc(50% - 18px);+ position: relative;+ background: #FFFF;+ top: -12px;+ color: red;+ font-size: 12px;+}++.hiprint-footerLine:hover:before {+ content: "页脚线";+ left: calc(50% - 18px);+ position: relative;+ color: red;+ background: #FFFF;+ top: -12px;+ font-size: 12px;+}+/* .hiprint-printElement-image-content img{+ content: url('@/assets/img/webLogoMini.png')!important;+} */diff --git a/frontend/src/types/Base/CommodityCategorySetting.ts b/frontend/src/types/Base/CommodityCategorySetting.tsindex 019063e..f059a0a 100644--- a/frontend/src/types/Base/CommodityCategorySetting.ts+++ b/frontend/src/types/Base/CommodityCategorySetting.ts@@ -1,5 +1,5 @@import { VxeTablePropTypes } from 'vxe-table'-import { UniformFileNaming } from '../System/Form'+import { UniformFileNaming, btnGroupItem } from '../System/Form'export interface CategoryVO extends UniformFileNaming {id: number@@ -13,4 +13,6 @@ export interface DataProps {tableTreeConfig: VxeTablePropTypes.TreeConfigshowDialog: booleandialogForm: CategoryVO+ btnList: btnGroupItem[]+ authorityList: string[]}diff --git a/frontend/src/types/Base/CommodityManagement.ts b/frontend/src/types/Base/CommodityManagement.tsindex b481859..efab387 100644--- a/frontend/src/types/Base/CommodityManagement.ts+++ b/frontend/src/types/Base/CommodityManagement.ts@@ -1,5 +1,5 @@import { VxeTablePropTypes } from 'vxe-table'-import { UniformFileNaming, TablePage } from '../System/Form'+import { UniformFileNaming, TablePage, btnGroupItem } from '../System/Form'export interface CommodityVO extends UniformFileNaming {id: number@@ -8,7 +8,6 @@ export interface CommodityVO extends UniformFileNaming {category_id?: numbercategory_name?: stringspu_description: string- bar_code: stringsupplier_id?: numbersupplier_name?: stringbrand: string@@ -31,6 +30,7 @@ export interface CommodityDetailVO {width?: numberheight?: numbervolume?: number+ detailList: UpdateSaftyStockReqBodyVO[]}export interface CommodityDetailJoinMainVO {@@ -57,6 +57,17 @@ export interface DataProps {spu_code: stringspu_name: stringcategory_name: string- },+ }timer: any+ btnList: btnGroupItem[]+ authorityList: string[]+ selectRowData: any[]+}++export interface UpdateSaftyStockReqBodyVO {+ id?: number+ sku_id?: number+ warehouse_id?: number+ warehouse_name: string+ safety_stock_qty: number}diff --git a/frontend/src/types/Base/CompanySetting.ts b/frontend/src/types/Base/CompanySetting.tsindex b52fca1..38d4f30 100644--- a/frontend/src/types/Base/CompanySetting.ts+++ b/frontend/src/types/Base/CompanySetting.ts@@ -1,4 +1,4 @@-import { UniformFileNaming } from '../System/Form'+import { UniformFileNaming, btnGroupItem } from '../System/Form'export interface CompanyVO extends UniformFileNaming {id: number@@ -13,4 +13,6 @@ export interface DataProps {tableData: CompanyVO[]showDialog: booleandialogForm: CompanyVO+ btnList: btnGroupItem[]+ authorityList: string[]}diff --git a/frontend/src/types/Base/OwnerOfCargo.ts b/frontend/src/types/Base/OwnerOfCargo.tsindex e980bd0..747faee 100644--- a/frontend/src/types/Base/OwnerOfCargo.ts+++ b/frontend/src/types/Base/OwnerOfCargo.ts@@ -1,4 +1,4 @@-import { UniformFileNaming, TablePage } from '../System/Form'+import { UniformFileNaming, TablePage, btnGroupItem } from '../System/Form'export interface OwnerOfCargoVO extends UniformFileNaming {id: number@@ -27,4 +27,6 @@ export interface DataProps {}tablePage: TablePagetimer: any+ btnList: btnGroupItem[]+ authorityList: string[]}diff --git a/frontend/src/types/Base/PrintSolution.ts b/frontend/src/types/Base/PrintSolution.tsnew file mode 100644index 0000000..f5d21cf--- /dev/null+++ b/frontend/src/types/Base/PrintSolution.ts@@ -0,0 +1,31 @@+import { TablePage, btnGroupItem } from '../System/Form'++export interface PrintSolutionVO {+ id: number+ vue_path?: string+ tab_page?: string+ solution_name: string+ config_json: string+ report_length: number+ report_width: number+ report_direction: string+}+export interface PrintSolutionGetByPathVo {+ vue_path: string+ tab_page: string+}+export interface DataProps {+ tableData: PrintSolutionVO[]+ showDialog: boolean+ dialogForm: PrintSolutionVO+ tablePage: TablePage+ searchForm: {+ vue_path: string+ tab_page: string+ solution_name: string+ }+ timer: any+ btnList: btnGroupItem[]+ authorityList: string[]+ selectRowData: any[]+}\ No newline at end of filediff --git a/frontend/src/types/Base/RoleMenu.ts b/frontend/src/types/Base/RoleMenu.tsindex d6b1942..570b500 100644--- a/frontend/src/types/Base/RoleMenu.ts+++ b/frontend/src/types/Base/RoleMenu.ts@@ -1,4 +1,4 @@-import { NavListOptions, UniformFileNaming, VxeTableRow } from '../System/Form'+import { NavListOptions, UniformFileNaming, VxeTableRow, btnGroupItem } from '../System/Form'export interface RoleMenuVO extends UniformFileNaming {userrole_id?: number@@ -10,6 +10,7 @@ export interface RoleMenuDetailVo extends VxeTableRow {id: numbermenu_id?: numbermenu_name?: string+ menu_actions_authority: string[]}export interface DataProps {@@ -18,4 +19,6 @@ export interface DataProps {showDialog: booleandialogForm: RoleMenuVOnavListOptions: NavListOptions+ btnList: btnGroupItem[]+ editMenuDialogCurrentRow: RoleMenuDetailVo}diff --git a/frontend/src/types/Base/UserManagement.ts b/frontend/src/types/Base/UserManagement.tsindex 9c8910e..b81885f 100644--- a/frontend/src/types/Base/UserManagement.ts+++ b/frontend/src/types/Base/UserManagement.ts@@ -1,4 +1,4 @@-import { UniformFileNaming, TablePage } from '../System/Form'+import { UniformFileNaming, TablePage, btnGroupItem } from '../System/Form'export interface UserVO extends UniformFileNaming {id: number@@ -33,6 +33,8 @@ export interface DataProps {showDialog: booleandialogForm: UserVOtimer: any+ btnList: btnGroupItem[]+ authorityList: string[]}export interface ChangePwdAPIParams {diff --git a/frontend/src/types/Base/UserRoleSetting.ts b/frontend/src/types/Base/UserRoleSetting.tsindex 9b9f341..84f6699 100644--- a/frontend/src/types/Base/UserRoleSetting.ts+++ b/frontend/src/types/Base/UserRoleSetting.ts@@ -1,4 +1,4 @@-import { UniformFileNaming } from '../System/Form'+import { UniformFileNaming, btnGroupItem } from '../System/Form'export interface UserRoleVO extends UniformFileNaming {id: number@@ -10,4 +10,6 @@ export interface DataProps {tableData: UserRoleVO[]showDialog: booleandialogForm: UserRoleVO+ btnList: btnGroupItem[]+ authorityList: string[]}diff --git a/frontend/src/types/DeliveryManagement/DeliveryManagement.ts b/frontend/src/types/DeliveryManagement/DeliveryManagement.tsindex 994077f..ff3296a 100644--- a/frontend/src/types/DeliveryManagement/DeliveryManagement.ts+++ b/frontend/src/types/DeliveryManagement/DeliveryManagement.ts@@ -38,6 +38,7 @@ export interface DeliveryManagementDetailVO extends DeliveryManagementVO {weight?: numbervolume?: numberweight_unit?: number+ is_todo: boolean}export interface addRequestVO {@@ -119,3 +120,11 @@ export interface ConfirmItem {weight?: numberweight_unit?: string}++export interface DeliveryBatchAllocationVO {+ id: number+ dateFrom: string+ dateTo: string+ allocationRule: string+ is_valid: boolean+}diff --git a/frontend/src/types/System/Form.ts b/frontend/src/types/System/Form.tsindex 4f48e84..1e95afe 100644--- a/frontend/src/types/System/Form.ts+++ b/frontend/src/types/System/Form.ts@@ -26,6 +26,7 @@ export interface PageConfigProps {pageSize: numbersqlTitle?: stringsearchObjects?: any+ total?: number}export interface VxeTableRow {@@ -42,4 +43,11 @@ export interface SearchObject {export enum SearchOperator {INCLUDE = 6,EQUAL = 1+}++export interface btnGroupItem {+ name: string+ icon: string+ code: string+ click: () => void}\ No newline at end of filediff --git a/frontend/src/types/WMS/DeliveryStatistic.ts b/frontend/src/types/WMS/DeliveryStatistic.tsnew file mode 100644index 0000000..ca69910--- /dev/null+++ b/frontend/src/types/WMS/DeliveryStatistic.ts@@ -0,0 +1,13 @@+export interface DeliveryStatisticVo {+ dispatch_no: string+ warehouse_name: string+ location_name: string+ sku_code: string+ sku_name: string+ spu_code: string+ spu_name: string+ customer_name: string+ series_number: string+ delivery_qty: number+ delivery_date: string+}diff --git a/frontend/src/types/WMS/SafetyStock.ts b/frontend/src/types/WMS/SafetyStock.tsnew file mode 100644index 0000000..f6e8b93--- /dev/null+++ b/frontend/src/types/WMS/SafetyStock.ts@@ -0,0 +1,13 @@+export interface SafetyStockVo {+ warehouse_name: string+ spu_code: string+ spu_name: string+ sku_code: string+ sku_name: string+ sku_id: number+ qty: number+ qty_available: number+ qty_locked: number+ qty_frozen: number+ safety_stock_qty: number+}diff --git a/frontend/src/types/WMS/StockAsn.ts b/frontend/src/types/WMS/StockAsn.tsindex 7f2b84a..cf1d81b 100644--- a/frontend/src/types/WMS/StockAsn.ts+++ b/frontend/src/types/WMS/StockAsn.ts@@ -1,32 +1,53 @@import { UniformFileNaming } from '../System/Form'export interface StockAsnVO extends UniformFileNaming {- id: number- asn_no: string- asn_status: number- spu_id: number- spu_code: string- spu_name: string- sku_id: number- sku_code: string- sku_name: string- origin: string- length_unit: number- volume_unit: number- weight_unit: number- asn_qty: number- actual_qty: number- sorted_qty: number- shortage_qty: number- more_qty: number- damage_qty: number- weight: number- volume: number- supplier_id: number- supplier_name: string- goods_owner_id: number- goods_owner_name: string- is_valid: boolean+ id?: number+ asn_no?: string+ spu_id?: number+ supplier_name?: string+ supplier_id?: number+ is_valid?: boolean+ spu_code?: string+ spu_name?: string+ sku_code?: string+ sku_name?: string+ origin?: string+ sku_id?: number+ asn_qty?: number+ asn_batch?: string+ estimated_arrival_time?: string+ asn_status?: number+ weight?: number+ volume?: number+ goods_owner_id?: number+ goods_owner_name?: string+ creator?: string+ create_time?: string+ last_update_time?: string+ detailList: StockAsnDetailVO[]+}++export interface StockAsnDetailVO {+ id?: number+ asnmaster_id?: number+ asn_status?: number+ spu_id?: number+ spu_code?: string+ spu_name?: string+ sku_id?: number+ sku_code?: string+ sku_name?: string+ origin?: string+ length_unit?: number+ volume_unit?: number+ weight_unit?: number+ asn_qty?: number+ actual_qty?: number+ weight?: number+ volume?: number+ supplier_id?: number+ supplier_name?: string+ is_valid?: boolean}export interface PutawayVo {@@ -68,3 +89,15 @@ export interface SkuInfoVo {cost: numberprice: number}++export interface UpdateSortingVo {+ id: number+ asn_id: number+ sorted_qty: number+ series_number: string+ creator: string+ create_time: string+ last_update_time: string+ is_valid: boolean+ tenant_id: number+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts b/frontend/src/types/WarehouseWorking/WarehouseFreeze.tsindex 91eeca0..8039ff4 100644--- a/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts+++ b/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts@@ -14,4 +14,5 @@ export interface WarehouseFreezeVO extends UniformFileNaming {spu_code: stringspu_name: stringsku_code: string+ series_number: string}diff --git a/frontend/src/types/WarehouseWorking/WarehouseMove.ts b/frontend/src/types/WarehouseWorking/WarehouseMove.tsindex 69e530b..53e46bc 100644--- a/frontend/src/types/WarehouseWorking/WarehouseMove.ts+++ b/frontend/src/types/WarehouseWorking/WarehouseMove.ts@@ -19,6 +19,7 @@ export interface WarehouseMoveVO extends UniformFileNaming {spu_name: stringsku_code: stringsku_name: string+ series_number: string}export enum MoveStatus {diff --git a/frontend/src/types/WarehouseWorking/WarehouseTaking.ts b/frontend/src/types/WarehouseWorking/WarehouseTaking.tsindex 8ec6b6b..3d1fbff 100644--- a/frontend/src/types/WarehouseWorking/WarehouseTaking.ts+++ b/frontend/src/types/WarehouseWorking/WarehouseTaking.ts@@ -13,6 +13,7 @@ export interface WarehouseTakingVO extends UniformFileNaming {spu_code: stringspu_name: stringsku_code: string+ series_number: stringwarehouse_name: stringlocation_name: stringadjust_status: booleandiff --git a/frontend/src/utils/common.ts b/frontend/src/utils/common.tsindex 68dd621..899ca71 100644--- a/frontend/src/utils/common.ts+++ b/frontend/src/utils/common.ts@@ -1,5 +1,7 @@import XEUtils from 'xe-utils'+import { useRoute } from 'vue-router'import { SearchObject, SearchOperator } from '@/types/System/Form'+import { store } from '@/store'export const setSearchObject = (searchForm: any, preciseSearchCols: string[] = []) => {const searchObjects: Array<SearchObject> = []@@ -55,3 +57,62 @@ export const removeObjectNull = (obj: any) => {})return copy}++// Obtain menu operation permissions+export const getMenuAuthorityList = () => {+ let AuthorityList: string[] = []++ const route = useRoute()++ const menu_name = route.path.substring(1)++ const menu_list: any[] = store.getters['user/menulist']++ const filter = menu_list.filter((item: any) => item.menu_name === menu_name)++ // Obtain permission list based on route+ if (filter.length > 0) {+ AuthorityList = filter[0].menu_actions+ } else {+ AuthorityList = []+ }++ return AuthorityList+}++// Retrieve data from cache in browser+export const getStorage = (key: string) => {+ // printCommidity...+ const value = localStorage.getItem(key)+ if (value) {+ return JSON.parse(value)+ }+ return null+}++// Store data in the browser's cache+export const setStorage = (key: string, value: any) => {+ localStorage.setItem(key, JSON.stringify(value))+}++// 获取菜单的查询条件设置+export const getMenuSearchSetting = (menu_name: string) => {+ const allSetting = getStorage('menu_search_setting')++ if (allSetting && allSetting[menu_name]) {+ return allSetting[menu_name]+ }++ return []+}++// 生成uuid方法+export const generateUUID = (): string => {+ let d = new Date().getTime()+ const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {+ const r = (d + Math.random() * 16) % 16 | 0+ d = Math.floor(d / 16)+ return (c === 'x' ? r : (r & 0x3) | 0x8).toString(16)+ })+ return uuid+}\ No newline at end of filediff --git a/frontend/src/utils/format/formatSystem.ts b/frontend/src/utils/format/formatSystem.tsindex 7c5fac9..2ea54c1 100644--- a/frontend/src/utils/format/formatSystem.ts+++ b/frontend/src/utils/format/formatSystem.ts@@ -3,7 +3,7 @@ import i18n from '@/languages/i18n'export const formatIsValid = (value: boolean) => (value ? i18n.global.t('system.combobox.yesOrNo.yes') : i18n.global.t('system.combobox.yesOrNo.no'))-export const formatDate = (value: string, format?: string) => {+export const formatDate = (value: any, format?: string) => {const date = new Date(value)if (!value || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01') {return ''diff --git a/frontend/src/utils/http/httpCodeJudge.ts b/frontend/src/utils/http/httpCodeJudge.tsnew file mode 100644index 0000000..62932ae--- /dev/null+++ b/frontend/src/utils/http/httpCodeJudge.ts@@ -0,0 +1,36 @@+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system'++// Obtain the code for error information+function extractNumbers(str: string): any {+ const regex = /^\[(\d+)\]/ // 匹配以 "[xxx]" 开头的字符串,并提取其中的数字部分++ const match = str.match(regex)++ if (match) {+ const extractedValue = match[1] // 提取匹配到的数字部分+ return extractedValue+ }+ return null+}++// Return the corresponding error information based on the error code+export const httpCodeJudge = (msg: string, showTip = true) => {+ const code = extractNumbers(msg)+ if (code) {+ switch (code) {+ case '202':+ if (showTip) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t(`${ i18n.global.t('system.tips.dataExpirationAutoRefresh') }`)+ })+ }+ return true+ default:+ return false+ }+ }++ return false+}diff --git a/frontend/src/utils/http/request.ts b/frontend/src/utils/http/request.tsindex 80c996a..c78bc07 100644--- a/frontend/src/utils/http/request.ts+++ b/frontend/src/utils/http/request.ts@@ -1,6 +1,6 @@import axios from 'axios' // 引入axiosimport { store } from '@/store'-import { emitter } from '@/utils/bus.js'+import { emitter } from '@/utils/bus'import { router } from '@/router'import { hookComponent } from '@/components/system'import i18n from '@/languages/i18n'diff --git a/frontend/src/utils/router/index.ts b/frontend/src/utils/router/index.tsindex c4af8d8..b9fd444 100644--- a/frontend/src/utils/router/index.ts+++ b/frontend/src/utils/router/index.ts@@ -26,6 +26,7 @@ export function menusToSideBar(): SideBarMenu[] {{ icon: GetModuleAndIcon('homepage'), lable: i18n.global.t('router.sideBar.homepage'), routerPath: 'homepage', showDetail: false }]const menuList: MenuItem[] = store.getters['user/menulist']+for (const menu of menuList) {// Get the module index and check whether this group existsconst moduleIndex = result.findIndex((item) => item.lable === i18n.global.t(`router.sideBar.${ menu.module }`))@@ -63,6 +64,7 @@ export function menusToSideBar(): SideBarMenu[] {}}}+ result.push({ icon: GetModuleAndIcon('homepage'), lable: i18n.global.t('router.sideBar.vwms'), routerPath: 'vwms', showDetail: false })return result}@@ -91,6 +93,8 @@ function GetMenuNameAndModule(path: string): string {return i18n.global.t('router.sideBar.warehouseSetting')case 'customer':return i18n.global.t('router.sideBar.customer')+ case 'print':+ return i18n.global.t('router.sideBar.print')case 'supplier':return i18n.global.t('router.sideBar.supplier')case 'roleMenu':@@ -111,6 +115,12 @@ function GetMenuNameAndModule(path: string): string {return i18n.global.t('router.sideBar.deliveryManagement')case 'stockAsn':return i18n.global.t('router.sideBar.stockAsn')+ case 'saftyStock':+ return i18n.global.t('router.sideBar.saftyStock')+ case 'deliveryStatistic':+ return i18n.global.t('router.sideBar.deliveryStatistic')+ case 'asnStatistic':+ return i18n.global.t('router.sideBar.asnStatistic')default:return ''}@@ -124,10 +134,12 @@ function GetModuleAndIcon(name: string) {case 'stockManagement':return 'warehouse'case 'stockAsn':+ case 'asnStatistic':return 'home-silo'case 'warehouseWorkingModule':return 'account-hard-hat-outline 'case 'deliveryManagement':+ case 'deliveryStatistic':return 'cube-send'case 'companySetting':return 'office-building'@@ -157,10 +169,16 @@ function GetModuleAndIcon(name: string) {return 'image-auto-adjust'case 'warehouseTaking':return 'ballot-recount-outline'- case 'customer':+ case 'customer':return 'account-box-outline'+ case 'print':+ return 'printer-outline'case 'supplier':return 'account-badge'+ case 'statisticAnalysis':+ return 'chart-pie'+ case 'saftyStock':+ return 'alarm-light'default:return ''}diff --git a/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vueindex fc63fbb..ba20581 100644--- a/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue+++ b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue@@ -7,14 +7,17 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><!-- <v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="12" sm="4"><v-text-field@@ -71,20 +74,27 @@<vxe-column type="seq" width="80"></vxe-column><vxe-column field="category_name" align="left" :title="$t('base.commodityCategorySetting.category_name')" tree-node></vxe-column><vxe-column field="creator" :title="$t('base.commodityCategorySetting.creator')"></vxe-column>- <vxe-column field="create_time" :title="$t('base.commodityCategorySetting.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.commodityCategorySetting.create_time')"+ ></vxe-column><vxe-column :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -109,6 +119,8 @@ import { hookComponent } from '@/components/system'import addOrUpdateDialog from './add-or-update-category.vue'import i18n from '@/languages/i18n'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { getMenuAuthorityList } from '@/utils/common'const xTable = ref()@@ -129,7 +141,10 @@ const data: DataProps = reactive({dialogForm: {id: 0,category_name: ''- }+ },+ btnList: [],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -209,7 +224,7 @@ const method = reactive({table: $table,filename: i18n.global.t('router.sideBar.commodityCategorySetting'),columnFilterMethod({ column }: any) {- return !['checkbox'].includes(column?.type)+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)}})}@@ -217,6 +232,27 @@ const method = reactive({onMounted(async () => {await method.getCommodityCategorySetting()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]})const cardHeight = computed(() => computedCardHeight({ hasTab: false }))diff --git a/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vueindex 643f5f5..ccb4a85 100644--- a/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue+++ b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue@@ -48,7 +48,7 @@clearableclass="mb-4"></v-text-field>- <v-text-field+ <!-- <v-text-fieldv-model="data.form.bar_code":rules="data.rules.bar_code":label="$t('base.commodityManagement.bar_code')"@@ -56,7 +56,7 @@density="compact"clearableclass="mb-4"- ></v-text-field>+ ></v-text-field> --><v-selectv-model="data.form.supplier_name":items="data.combobox.supplier_name"@@ -167,6 +167,11 @@<vxe-input v-model="row.unit" type="text"></vxe-input></template></vxe-column>+ <vxe-column field="bar_code" :title="$t('base.commodityManagement.bar_code')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.bar_code" type="text"></vxe-input>+ </template>+ </vxe-column><vxe-column field="weight" :title="$t('base.commodityManagement.weight')" :edit-render="{ autofocus: '.vxe-input--inner' }"><template #edit="{ row }"><vxe-input v-model="row.weight" type="text"></vxe-input>@@ -200,12 +205,6 @@</vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="100" :resizable="false" show-overflow><template #default="{ row }">- <!-- <tooltip-btn- :flat="true"- icon="mdi-pencil-outline"- :tooltip-text="$t('system.page.edit')"- @click="method.editRow(row)"- ></tooltip-btn> --><tooltip-btn:flat="true"icon="mdi-delete-outline"@@ -223,8 +222,10 @@<v-card-actions class="justify-end"><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn><v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.print">{{ $t('system.page.print') }}</v-btn></v-card-actions></v-card>+ <hprintDialog ref="hprintDialogRef" :form="data.form" :tab-page="'print_page_detail'" /></template></v-dialog></template>@@ -245,11 +246,12 @@ import { removeArrayNull } from '@/utils/common'import { StringLength } from '@/utils/dataVerification/formRule'import { isDecimal } from '@/utils/dataVerification/tableRule'import { exportData } from '@/utils/exportTable'+import hprintDialog from '@/components/hiprint/hiprintFast.vue'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])const xTable = ref()-+const hprintDialogRef = ref()const props = defineProps<{showDialog: booleanform: CommodityVO@@ -272,7 +274,6 @@ const data = reactive({category_id: 0,category_name: '',spu_description: '',- bar_code: '',supplier_id: 0,supplier_name: '',brand: '',@@ -293,7 +294,7 @@ const data = reactive({(val: string) => StringLength(val, 0, 200) === '' || StringLength(val, 0, 200)],spu_description: [(val: string) => StringLength(val, 0, 1000) === '' || StringLength(val, 0, 1000)],- bar_code: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ // bar_code: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],brand: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],category_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.category_name') }!`@@ -312,6 +313,15 @@ const data = reactive({]},validRules: ref<any>({+ bar_code: [+ {+ type: 'string',+ min: 0,+ max: 64,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 64 }`,+ trigger: 'change'+ }+ ],sku_code: [{ required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }` },{@@ -588,6 +598,10 @@ const method = reactive({})}},+ print() {+ const ref = hprintDialogRef.value+ ref.method.handleOpen()+ },editRow: (row: CommodityDetailVO) => {const $table = xTable.value$table.setEditRow(row)diff --git a/frontend/src/view/base/commodityManagement/barCodeDialog.vue b/frontend/src/view/base/commodityManagement/barCodeDialog.vuenew file mode 100644index 0000000..3fa3497--- /dev/null+++ b/frontend/src/view/base/commodityManagement/barCodeDialog.vue@@ -0,0 +1,110 @@+<template>+ <v-dialog v-model="data.showDialog" :persistent="true" transition="dialog-top-transition" width="348px">+ <template #default>+ <v-card>+ <v-card-text>+ <div id="printArea" class="printArea">+ <div>+ <div+ style="width: 100%; height: 100%; display: flex; flex: none; justify-content: center; align-items: center"+ >+ <svg id="printBarCode"></svg>+ </div>+ </div>+ <!-- </div> -->+ </div>++ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn v-print="'#printArea'" :disabled="isDisabled" color="primary" variant="text">+ {{ $t('system.page.print') }}+ </v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="tsx" setup>+import { computed, nextTick, reactive } from 'vue'+import JsBarcode from 'jsbarcode'+import { CommodityVO } from '@/types/Base/CommodityManagement'++const data = reactive({+ showDialog: false,+ printData: {+ sku_id: 0,+ spu_name: '',+ spu_code: '',+ sku_name: '',+ sku_code: '',+ barcode: ''+ } as any+})+const isDisabled = computed(() => data.printData.barcode === '')+const method = reactive({+ openDialog: (row: CommodityVO) => {+ data.printData = row++ data.showDialog = true++ nextTick(() => {+ JsBarcode('#printBarCode', data.printData.barcode, {+ fontSize: 12,+ width: 2,+ height: 40,+ displayValue: true+ })+ })+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style lang="less" scoped>+.printArea {+ width: 300px;+ // display: flex;+ // flex-wrap: wrap;+ // align-items: center;+ // justify-content: center;+ text-align: center;++ box-sizing: border-box;+ padding: 10px;+ .printTopContainer {+ display: flex;+ justify-content: space-between;+ }+}++.printLabel {+ font-size: 14px;+ font-weight: bold;++ display: flex;+ flex-wrap: wrap;+ align-items: center;++ box-sizing: border-box;+ padding-left: 20px;++ .labelTitle {+ opacity: 0.7;+ font-weight: 600;+ }++ div {+ width: 100%;+ }+}+</style>diff --git a/frontend/src/view/base/commodityManagement/commodityManagement.vue b/frontend/src/view/base/commodityManagement/commodityManagement.vueindex 9c443cf..f5ad146 100644--- a/frontend/src/view/base/commodityManagement/commodityManagement.vue+++ b/frontend/src/view/base/commodityManagement/commodityManagement.vue@@ -7,14 +7,17 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="4"><v-text-field@@ -77,8 +80,27 @@<template #empty>{{ i18n.global.t('system.page.noData') }}</template>+ <vxe-column type="checkbox" width="50" fixed="left"></vxe-column><vxe-column type="seq" width="60"></vxe-column>- <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')" tree-node>+ <vxe-column tree-node width="60">+ <template #header>+ <div+ style="height: 100%; display: flex; align-items: center; justify-content: flex-start; cursor: pointer"+ @click="method.expandAllRows()"+ >+ <v-tooltip location="bottom">+ <template #activator="{ props }">+ <div v-bind="props">+ <v-icon v-if="!isExpandAll" size="large">mdi-menu-right</v-icon>+ <v-icon v-else size="large">mdi-menu-down</v-icon>+ </div>+ </template>+ <span>{{ $t('base.roleMenu.expandRow') }}</span>+ </v-tooltip>+ </div>+ </template>+ </vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"><template #default="{ row }"><span v-if="row.parent_id > 0">{{ row.sku_code }}</span><span v-else>{{ row.spu_code }}</span>@@ -96,11 +118,11 @@<span v-else>{{ row.category_name }}</span></template></vxe-column>- <vxe-column field="spu_description" :title="$t('base.commodityManagement.spu_description')"> </vxe-column>- <vxe-column field="bar_code" :title="$t('base.commodityManagement.bar_code')"> </vxe-column>+ <vxe-column field="spu_description" width="200" :title="$t('base.commodityManagement.spu_description')"> </vxe-column><vxe-column field="supplier_name" :title="$t('base.commodityManagement.supplier_name')"> </vxe-column><vxe-column field="brand" :title="$t('base.commodityManagement.brand')"> </vxe-column>+ <vxe-column field="bar_code" :title="$t('base.commodityManagement.bar_code')"> </vxe-column><vxe-column field="weight" :title="$t('base.commodityManagement.weight')"><template #default="{ row }"><span v-if="row.parent_id > 0">{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>@@ -142,23 +164,48 @@<vxe-column field="brand" :title="$t('base.commodityManagement.brand')"></vxe-column><vxe-column field="unit" :title="$t('base.commodityManagement.unit')"></vxe-column><vxe-column field="cost" :title="$t('base.commodityManagement.cost')"></vxe-column> -->- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160px" :resizable="false" show-overflow><template #default="{ row }"><div v-if="!row.parent_id || row.parent_id <= 0"><tooltip-btn:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete') ? '' : errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></div>+ <div v-else>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-qrcode"+ :tooltip-text="$t('base.commodityManagement.printQrCode')"+ :disabled="!data.authorityList.includes('printQrCode')"+ @click="method.printQrCode(row)"+ ></tooltip-btn> -->+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-barcode"+ :tooltip-text="$t('base.commodityManagement.printBarCode')"+ :disabled="!data.authorityList.includes('printBarCode')"+ @click="method.printBarCode(row)"+ ></tooltip-btn> -->+ <tooltip-btn+ :flat="true"+ icon="mdi-alarm-light"+ :tooltip-text="$t('base.commodityManagement.saftyStock')"+ :disabled="!data.authorityList.includes('saftyStock')"+ @click="method.openUpdateSaftyStockDialog(row)"+ ></tooltip-btn>+ </div></template></vxe-column></vxe-table>@@ -178,27 +225,53 @@</div><!-- Add or modify data mode window --><addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />++ <update-sku-safety-stock ref="updateSkuSaftyStockRef" @sure="method.updateSkuSaftyStockByRow" />++ <!-- Print QR code -->+ <qr-code-dialog ref="qrCodeDialogRef" :menu="'commodityManagement'">+ <template #left="{ slotData }">+ <p>{{ $t('base.commodityManagement.spu_code') }}:{{ slotData.spu_code }}</p>+ <p>{{ $t('base.commodityManagement.spu_name') }}:{{ slotData.spu_name }}</p>+ <p>{{ $t('base.commodityManagement.sku_code') }}:{{ slotData.sku_code }}</p>+ <p>{{ $t('base.commodityManagement.sku_name') }}:{{ slotData.sku_name }}</p>+ </template>+ </qr-code-dialog>++ <!-- Print barcode -->+ <bar-code-dialog ref="barCodeDialogRef" :menu="'commodityManagement'" />+ <hprintDialog ref="hprintDialogRef" :form="printDate.printForm" :tab-page="'print_page_main'" /></div></template><script lang="ts" setup>-import { computed, reactive, onMounted, ref, watch } from 'vue'+import { computed, onMounted, reactive, ref, watch } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import tooltipBtn from '@/components/tooltip-btn.vue'-import { CommodityVO, DataProps } from '@/types/Base/CommodityManagement'-import { getSpuList, deleteSpu } from '@/api/base/commodityManagementSetting'+import { CommodityVO, DataProps, CommodityDetailVO, UpdateSaftyStockReqBodyVO } from '@/types/Base/CommodityManagement'+import { getSpuList, deleteSpu, updateSaftyStock } from '@/api/base/commodityManagementSetting'import { hookComponent } from '@/components/system'import addOrUpdateDialog from './add-or-update-commodity.vue'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'+import updateSkuSafetyStock from './update-sku-safety-stock.vue'+// import qrCodeDialogDialog from './qrCodeDialog.vue'+import BarCodeDialog from '@/components/codeDialog/barCodeDialog.vue'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'+import hprintDialog from '@/components/hiprint/hiprintFast.vue'const xTable = ref()+const updateSkuSaftyStockRef = ref()+const qrCodeDialogRef = ref()+const barCodeDialogRef = ref()+const hprintDialogRef = ref()const data: DataProps = reactive({searchForm: {@@ -236,10 +309,108 @@ const data: DataProps = reactive({volume_unit: 0,weight_unit: 1,detailList: []- }+ },+ btnList: [],+ authorityList: getMenuAuthorityList(),+ selectRowData: []+})+const printDate = reactive({+ printForm: {} as any})-const method = reactive({+ // Check if the checkbox can be checked+ getCheckBoxDisableState: ({ row }: { row: any }): boolean => row.parent_id,+ // Print QR code+ printQrCode: () => {+ let records = xTable.value.getCheckboxRecords()+ const parentRecords = records.filter((item) => !item.parent_id)+ records = records.filter((item) => item.parent_id)++ // data.selectRowData.length === 0 ? (data.selectRowData = [row]) : ''+ // let records: any[] = data.selectRowData+ if (records.length > 0) {+ for (const parent of parentRecords) {+ for (const child of records) {+ if (parent.id === child.parent_id) {+ child.spu_code = parent.spu_code+ child.spu_name = parent.spu_name+ child.type = 'commodity'+ }+ }+ }+ qrCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ printBarCode: () => {+ let records = xTable.value.getCheckboxRecords()+ records = records.filter((item: any) => item.parent_id)+ records = records.filter((item: any) => item.bar_code)++ // data.selectRowData.length === 0 ? (data.selectRowData = [row]) : ''+ // let records = data.selectRowData+ if (records.length > 0) {+ barCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ print: () => {+ const records = xTable.value.getCheckboxRecords()+ if (records.length > 0) {+ printDate.printForm = { detailList: records }+ const ref = hprintDialogRef.value+ ref.method.handleOpen()+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ selectAllEvent({ checked }) {+ const records = xTable.value.getCheckboxRecords()+ checked ? (data.selectRowData = records) : (data.selectRowData = [])+ },+ selectChangeEvent() {+ data.selectRowData = xTable.value.getCheckboxRecords()+ },+ expandAllRows: () => {+ const expandRows = xTable.value.getTreeExpandRecords()+ const parentData = data.tableData.filter((item: any) => !item.parent_id)++ if (expandRows.length === parentData.length) {+ xTable.value.setAllTreeExpand(false)+ } else {+ xTable.value.setAllTreeExpand(true)+ }+ },+ updateSkuSaftyStockByRow: async (body: { sku_id: number; detailList: UpdateSaftyStockReqBodyVO[] }) => {+ const { data: res } = await updateSaftyStock(body)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ updateSkuSaftyStockRef.value.closeDialog()+ method.refresh()+ },+ openUpdateSaftyStockDialog: (row: CommodityDetailVO) => {+ updateSkuSaftyStockRef.value.openDialog(row)+ },sureSearch: () => {data.tablePage.searchObjects = setSearchObject(data.searchForm)method.getCompanyList()@@ -276,7 +447,6 @@ const method = reactive({spu_code: '',spu_name: '',spu_description: '',- bar_code: '',brand: '',length_unit: 1,volume_unit: 0,@@ -345,12 +515,73 @@ const method = reactive({onMounted(async () => {await method.getCompanyList()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('base.commodityManagement.printQrCode'),+ icon: 'mdi-qrcode',+ code: 'printQrCode',+ click: method.printQrCode+ },+ {+ name: i18n.global.t('base.commodityManagement.printBarCode'),+ icon: 'mdi-barcode',+ code: 'printBarCode',+ click: method.printBarCode+ },+ {+ name: i18n.global.t('system.page.print'),+ icon: 'mdi-printer',+ code: '',+ click: method.print+ }+ // {+ // name: i18n.global.t('base.commodityManagement.printQrCode'),+ // icon: 'mdi-qrcode',+ // code: 'printQrCode',+ // click: method.printQrCode+ // },+ // {+ // name: i18n.global.t('base.commodityManagement.printBarCode'),+ // icon: 'mdi-barcode',+ // code: 'printBarCode',+ // click: method.printBarCode+ // }+ ]})const cardHeight = computed(() => computedCardHeight({ hasTab: false }))const tableHeight = computed(() => computedTableHeight({ hasTab: false }))+const isExpandAll = computed(() => {+ const expandRows = xTable.value.getTreeExpandRecords()+ const parentData = data.tableData.filter((item: any) => !item.parent_id)++ if (expandRows.length === parentData.length) {+ return true+ }+ return false+})+watch(() => data.searchForm,() => {diff --git a/frontend/src/view/base/commodityManagement/qrCodeDialog.vue b/frontend/src/view/base/commodityManagement/qrCodeDialog.vuenew file mode 100644index 0000000..47afa26--- /dev/null+++ b/frontend/src/view/base/commodityManagement/qrCodeDialog.vue@@ -0,0 +1,116 @@+<template>+ <v-dialog v-model="data.showDialog" width="448px" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-card-text>+ <div id="printArea" class="printArea">+ <div class="printTopContainer">+ <div>+ <vue-qr :key="data.printText" size="140" :margin="0" :auto-color="true" :dot-scale="1" :text="data.printText"></vue-qr>+ </div>++ <div class="printLabel" style="flex: 1">+ <div>+ <span class="labelTitle">{{ $t('base.commodityManagement.spu_code') }}:</span> {{ data.printData.spu_code }}+ </div>+ <div>+ <span class="labelTitle">{{ $t('base.commodityManagement.spu_name') }}:</span> {{ data.printData.spu_name }}+ </div>+ <div>+ <span class="labelTitle">{{ $t('base.commodityManagement.sku_code') }}:</span> {{ data.printData.sku_code }}+ </div>+ <div>+ <span class="labelTitle">{{ $t('base.commodityManagement.sku_name') }}:</span> {{ data.printData.sku_name }}+ </div>+ </div>+ </div>+ </div>+ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" variant="text">{{ $t('system.page.print') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script setup lang="tsx">+import { reactive } from 'vue'+import VueQr from 'vue-qr/src/packages/vue-qr.vue'++const data = reactive({+ showDialog: false,+ printData: {+ sku_id: 0,+ spu_name: '',+ spu_code: '',+ sku_name: '',+ sku_code: '',+ barcode: ''+ } as any,+ printText: ''+})++const method = reactive({+ openDialog: (row: any) => {+ data.printData = row++ // 二维码内容+ data.printText = JSON.stringify({+ sku_id: row.sku_id,+ type: row.type+ })++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.printArea {+ width: 400px;++ display: flex;+ flex-wrap: wrap;+ align-items: center;+ justify-content: center;++ box-sizing: border-box;+ padding: 10px;++ .printTopContainer {+ display: flex;+ justify-content: space-between;+ }+}+.printLabel {+ font-size: 14px;+ font-weight: bold;++ display: flex;+ flex-wrap: wrap;+ align-items: center;++ box-sizing: border-box;+ padding-left: 30px;++ .labelTitle {+ opacity: 0.7;+ font-weight: 600;+ }++ div {+ width: 100%;+ }+}+</style>diff --git a/frontend/src/view/base/commodityManagement/update-sku-safety-stock.vue b/frontend/src/view/base/commodityManagement/update-sku-safety-stock.vuenew file mode 100644index 0000000..70fc7b9--- /dev/null+++ b/frontend/src/view/base/commodityManagement/update-sku-safety-stock.vue@@ -0,0 +1,197 @@+<template>+ <v-dialog v-model="data.showDialog" width="50%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.commodityManagement')}`"></v-toolbar>+ <v-card-text>+ <div>+ <v-row>+ <v-col cols="6">+ <v-text-field+ v-model="data.skuInfo.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ variant="outlined"+ density="compact"+ readonly+ ></v-text-field>+ </v-col>+ <v-col cols="6">+ <v-text-field+ v-model="data.skuInfo.sku_name"+ :label="$t('base.commodityManagement.sku_name')"+ variant="outlined"+ density="compact"+ readonly+ ></v-text-field>+ </v-col>+ </v-row>+ </div>+ <div>+ <v-form ref="formRef">+ <v-row v-for="(item, index) of data.detailList" :key="index" style="margin-top: 5px">+ <v-col :cols="7">+ <v-text-field+ v-model="item.warehouse_name"+ :label="$t('wms.deliveryManagement.warehouse_name')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ readonly+ ></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field+ v-model="item.safety_stock_qty"+ :rules="data.rules.safety_stock_qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ <v-col :cols="2">+ <div class="detailBtnContainer">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(index, item)"+ ></tooltip-btn>+ </div>+ </v-col>+ </v-row>+ </v-form>++ <v-btn style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right" color="primary" :width="40" @click="method.addNewRow">+ ++ </v-btn>+ </div>+ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.sureBack">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <warehouse-select ref="warehouseSelectRef" @sure-select="method.warehouseSureSelect" />+</template>++<script setup lang="tsx">+import { reactive, ref, nextTick } from 'vue'+import { CommodityDetailVO, UpdateSaftyStockReqBodyVO } from '@/types/Base/CommodityManagement'+import { errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import warehouseSelect from '@/components/select/warehouse-select.vue'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { IsInteger } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['sure'])++const warehouseSelectRef = ref()+const formRef = ref()++const data = reactive({+ showDialog: false as boolean,+ detailList: [] as UpdateSaftyStockReqBodyVO[],+ rules: {+ warehouse_name: [],+ safety_stock_qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'nonNegative') === '' || IsInteger(val, 'nonNegative')+ ]+ },+ skuInfo: {} as CommodityDetailVO,+ cacheDeleteDetail: [] as UpdateSaftyStockReqBodyVO[]+})++const method = reactive({+ openDialog: (row: CommodityDetailVO) => {+ data.cacheDeleteDetail = []++ data.showDialog = true+ nextTick(() => {+ data.skuInfo = row++ data.detailList = row.detailList+ })+ },+ closeDialog: () => {+ data.showDialog = false+ },+ addNewRow: () => {+ warehouseSelectRef.value.openDialog()+ },+ deleteRow: (index: number, item: UpdateSaftyStockReqBodyVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (item.id && item.id > 0) {+ const delItem = { ...item }+ delItem.id = 0 - item.id+ data.cacheDeleteDetail.push(delItem)+ }++ data.detailList.splice(index, 1)+ }+ })+ },+ // After selection+ warehouseSureSelect: (list: WarehouseVO[]) => {+ for (const item of list) {+ const fl = data.detailList.filter((i: UpdateSaftyStockReqBodyVO) => i.warehouse_id === item.id)++ // If it already exists, do not insert it+ if (fl.length === 0) {+ data.detailList.push({+ id: 0,+ sku_id: data.skuInfo.id,+ warehouse_id: item.id,+ warehouse_name: item.warehouse_name,+ safety_stock_qty: 0+ })+ }+ }+ },+ // Confirm Save+ sureBack: async () => {+ const { valid } = await formRef.value.validate()++ if (valid) {+ emit('sure', {+ sku_id: data.skuInfo.id,+ detailList: [...data.detailList, ...data.cacheDeleteDetail]+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.mainForm {+ background-color: #f9f9f9;+ border-radius: 5px;+ padding: 20px;+ box-sizing: border-box;+ overflow: auto;+}+.detailBtnContainer {+ height: 56px;+ display: flex;+ justify-content: center;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/companySetting/companySetting.vue b/frontend/src/view/base/companySetting/companySetting.vueindex 80754ac..7fda6ce 100644--- a/frontend/src/view/base/companySetting/companySetting.vue+++ b/frontend/src/view/base/companySetting/companySetting.vue@@ -7,14 +7,19 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>++ <!-- old version -->+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><!-- <v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="12" sm="4"><v-text-field@@ -80,13 +85,15 @@:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -111,6 +118,8 @@ import { hookComponent } from '@/components/system'import addOrUpdateDialog from './add-or-update-company.vue'import i18n from '@/languages/i18n'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { getMenuAuthorityList } from '@/utils/common'const xTable = ref()@@ -130,7 +139,10 @@ const data: DataProps = reactive({address: '',manager: '',contact_tel: ''- }+ },+ btnList: [],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -203,18 +215,39 @@ const method = reactive({// Export tableexportTable: () => {const $table = xTable.value- exportData({- table: $table,- filename: i18n.global.t('router.sideBar.companySetting'),- columnFilterMethod({ column }: any) {- return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)- }- })+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.companySetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })}})onMounted(async () => {await method.getCompanyList()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]})const cardHeight = computed(() => computedCardHeight({ hasTab: false }))diff --git a/frontend/src/view/base/customer/add-or-update-customer.vue b/frontend/src/view/base/customer/add-or-update-customer.vueindex 71e3ba2..e3337cb 100644--- a/frontend/src/view/base/customer/add-or-update-customer.vue+++ b/frontend/src/view/base/customer/add-or-update-customer.vue@@ -41,8 +41,10 @@<v-card-actions class="justify-end"><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn><v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.print">{{ $t('system.page.print') }}</v-btn></v-card-actions></v-card>+ <hprintDialog ref="hprintDialogRef" :form="data.form" :tab-page="'print_page_detail'" /></template></v-dialog></template>@@ -53,8 +55,10 @@ import { CustomerVO } from '@/types/Base/Customer'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addCustomer, updateCustomer } from '@/api/base/customer'+import hprintDialog from '@/components/hiprint/hiprintFast.vue'const formRef = ref()+const hprintDialogRef = ref()const emit = defineEmits(['close', 'saveSuccess'])const props = defineProps<{@@ -119,7 +123,11 @@ const method = reactive({content: i18n.global.t('system.checkText.checkFormFail')})}- }+ },+ print() {+ const ref = hprintDialogRef.value+ ref.method.handleOpen()+ },})watch(diff --git a/frontend/src/view/base/customer/customer.vue b/frontend/src/view/base/customer/customer.vueindex 6298874..7f57280 100644--- a/frontend/src/view/base/customer/customer.vue+++ b/frontend/src/view/base/customer/customer.vue@@ -10,16 +10,19 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn><tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="12" sm="4"></v-col><v-col cols="12" sm="4"></v-col>@@ -47,7 +50,15 @@height: cardHeight}">- <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table+ ref="xTable"+ :data="data.tableData"+ :column-config="{+ minWidth: '100px'+ }"+ :height="tableHeight"+ align="center"+ ><template #empty>{{ i18n.global.t('system.page.noData') }}</template>@@ -60,16 +71,14 @@<vxe-column field="email" :title="$t('base.customer.email')"></vxe-column><vxe-column field="contact_tel" :title="$t('base.customer.contact_tel')"></vxe-column><vxe-column field="creator" :title="$t('base.customer.creator')"></vxe-column>- <vxe-column field="create_time" :title="$t('base.customer.create_time')">- <!-- :formatter="['formatDate', 'yyyy-MM-dd HH:mm:ss']" -->- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column field="create_time" width="170px" :formatter="['formatDate', 'yyyy-MM-dd HH:mm']" :title="$t('base.customer.create_time')"></vxe-column>- <vxe-column field="last_update_time" :title="$t('base.customer.last_update_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column+ field="last_update_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.customer.last_update_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">@@ -77,13 +86,15 @@:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -108,28 +119,31 @@</div><addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" /><importCustomerTable :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ <hprintDialog ref="hprintDialogRef" :form="data.printForm" :tab-page="'print_page_main'" /></template><script lang="tsx" setup>import { computed, ref, reactive, onMounted, watch } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'-import { CustomerVO, DataProps } from '@/types/Base/Customer'+import { CustomerVO } from '@/types/Base/Customer'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-customer.vue'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import i18n from '@/languages/i18n'import { getCustomerList, deleteCustomer } from '@/api/base/customer'import importCustomerTable from './import-customer-table.vue'-import { formatDate } from '@/utils/format/formatSystem'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import hprintDialog from '@/components/hiprint/hiprintFast.vue'const xTable = ref()+const hprintDialogRef = ref()const data = reactive({searchForm: {@@ -155,7 +169,11 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])},- timer: ref<any>(null)+ printForm: {} as any,+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList() as string[]})const method = reactive({@@ -253,9 +271,55 @@ const method = reactive({}data.tableData = res.data.rowsdata.tablePage.total = res.data.totals- }+ },+ print: () => {+ const records = xTable.value.getCheckboxRecords()+ if (records.length > 0) {+ data.printForm = { detailList: records }+ const ref = hprintDialogRef.value+ ref.method.handleOpen()+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },})onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.import'),+ icon: 'mdi-database-import-outline',+ code: 'import',+ click: method.openDialogImport+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('system.page.print'),+ icon: 'mdi-printer',+ code: '',+ click: method.print+ }+ ]+method.getData()})diff --git a/frontend/src/view/base/freightSetting/freightSetting.vue b/frontend/src/view/base/freightSetting/freightSetting.vueindex 04b7163..eb9b123 100644--- a/frontend/src/view/base/freightSetting/freightSetting.vue+++ b/frontend/src/view/base/freightSetting/freightSetting.vue@@ -11,11 +11,14 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn><tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -82,7 +85,12 @@<vxe-column field="price_per_volume" :title="$t('base.freightSetting.price_per_volume')"></vxe-column><vxe-column field="min_payment" :title="$t('base.freightSetting.min_payment')"></vxe-column><vxe-column field="creator" :title="$t('base.freightSetting.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('base.freightSetting.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.freightSetting.create_time')"+ ></vxe-column><vxe-column field="is_valid" :title="$t('base.freightSetting.is_valid')"><template #default="{ row, column }"><span>{{ row[column.property] ? $t('system.combobox.yesOrNo.yes') : $t('system.combobox.yesOrNo.no') }}</span>@@ -94,13 +102,15 @@:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -135,14 +145,15 @@ import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { deleteFreight, getFreightList } from '@/api/base/freightSetting'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import tooltipBtn from '@/components/tooltip-btn.vue'import customPager from '@/components/custom-pager.vue'import addOrUpdateDialog from './add-or-update-freight.vue'import importTable from './import-table.vue'import i18n from '@/languages/i18n'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -173,7 +184,9 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ authorityList: getMenuAuthorityList() as string[]})const method = reactive({@@ -280,6 +293,33 @@ const method = reactive({})onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.import'),+ icon: 'mdi-database-import-outline',+ code: 'import',+ click: method.openDialogImport+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+method.getFreightList()})diff --git a/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vueindex 6bed762..d490af4 100644--- a/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue+++ b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue@@ -7,16 +7,19 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn><tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="4"> </v-col><v-col cols="4"> </v-col>@@ -44,7 +47,15 @@height: cardHeight}">- <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table+ ref="xTable"+ :column-config="{+ minWidth: '100px'+ }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ ><template #empty>{{ i18n.global.t('system.page.noData') }}</template>@@ -55,20 +66,27 @@<vxe-column field="contact_tel" :title="$t('base.ownerOfCargo.contact_tel')"></vxe-column><vxe-column field="manager" :title="$t('base.ownerOfCargo.manager')"></vxe-column><vxe-column field="creator" :title="$t('base.ownerOfCargo.creator')"></vxe-column>- <vxe-column field="create_time" :title="$t('base.ownerOfCargo.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.ownerOfCargo.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -105,11 +123,12 @@ import { hookComponent } from '@/components/system'import addOrUpdateDialog from './add-or-update-owner-of-cargo.vue'import i18n from '@/languages/i18n'import importTable from './import-table.vue'-import { setSearchObject } from '@/utils/common'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import customPager from '@/components/custom-pager.vue'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -134,7 +153,10 @@ const data: DataProps = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE},- timer: null+ timer: null,+ btnList: [],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -237,6 +259,33 @@ const method = reactive({})onMounted(async () => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.import'),+ icon: 'mdi-database-import-outline',+ code: 'import',+ click: method.openDialogImport+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+await method.getOwnerOfCargoList()})diff --git a/frontend/src/view/base/print/add-or-update-print.vue b/frontend/src/view/base/print/add-or-update-print.vuenew file mode 100644index 0000000..f5506f9--- /dev/null+++ b/frontend/src/view/base/print/add-or-update-print.vue@@ -0,0 +1,687 @@+<template>+ <v-dialog v-model="isShow" fullscreen :scrim="false" transition="dialog-bottom-transition">+ <v-card>+ <div style="padding: 15px 15px">+ <v-row no-gutters>+ <v-col cols="4">+ <v-row no-gutters>+ <v-col :cols="4">+ <v-select+ v-model="data.form.vue_path"+ :items="menuList"+ item-title="label"+ item-value="value"+ :label="$t('base.printSolution.vue_path')"+ density="compact"+ hide-details+ clearable+ variant="outlined"+ :disabled="props.form.id > 0"+ @update:model-value="method.handleChangePath()"+ ></v-select>+ </v-col>+ <v-col cols="4">+ <div style="padding-left: 5px">+ <v-select+ v-model="data.form.tab_page"+ :items="data.pageList"+ item-title="label"+ item-value="value"+ :label="$t('base.printSolution.tab_page')"+ density="compact"+ hide-details+ :disabled="props.form.id > 0"+ clearable+ variant="outlined"+ @update:model-value="method.handleChangePage()"+ ></v-select>+ </div>+ </v-col>+ <v-col cols="4">+ <div style="padding-left: 5px">+ <v-text-field+ v-model="data.form.solution_name"+ :label="$t('base.printSolution.solution_name')"+ density="compact"+ hide-details+ clearable+ variant="outlined"+ :disabled="props.form.id > 0"+ ></v-text-field>+ </div>+ </v-col>+ </v-row>+ </v-col>+ <v-col cols="7">+ <div class="center-btn-box">+ <div>+ <v-btn+ v-for="(value, type) in data.paperTypes"+ :key="type"+ :color="curPaperType === type ? 'indigo-darken-3' : 'white'"+ @click="method.handleSetPaper(type, value)"+ >+ {{ type }}+ </v-btn>+ <v-btn+ icon="mdi-magnify-minus-outline"+ style="font-size: 14px; margin-left: 10px"+ size="small"+ @click="method.handleChangeScale(false)"+ ></v-btn>+ <v-btn disabled size="small" style="margin-left: 10px; width: 70px">{{ scaleValueStr }}%</v-btn>+ <v-btn+ icon="mdi-magnify-plus-outline"+ style="font-size: 14px; margin-left: 10px"+ size="small"+ @click="method.handleChangeScale(true)"+ ></v-btn>+ </div>+ <div>+ <v-btn style="font-size: 14px; margin-left: 10px" @click="method.handlePreView()">+ {{ $t('system.page.preView') }}+ </v-btn>+ <v-btn+ style="font-size: 14px; margin-left: 10px"+ :disabled="!data.form.solution_name || !data.form.tab_page"+ color="primary"+ @click="method.handleSubmit"+ >+ {{ $t('system.page.submit') }}+ </v-btn>+ </div>+ </div>+ </v-col>+ <v-col cols="1">+ <div class="right-top-box">+ <v-btn icon style="font-size: 14px; margin-left: 10px" size="small" @click="method.handleClose()">+ <v-icon>mdi-close</v-icon>+ </v-btn>+ </div>+ </v-col>+ </v-row>+ <v-row>+ <v-col cols="2">+ <div class="left-box">+ <div id="hiprintEpContainer" class="rect-printElement-types hiprintEpContainer"> </div>+ </div>+ </v-col>+ <v-col cols="7">+ <div class="center-box card-design">+ <div id="hiprint-printTemplate" style="margin-top: 20px" class="hiprint-printTemplate"></div>+ </div>+ </v-col>+ <v-col cols="3">+ <div class="right-box">+ <div id="PrintElementOptionSetting"></div>+ </div>+ </v-col>+ </v-row>+ </div>+ </v-card>++ <preViewDialog ref="preViewDialogRef" />+ </v-dialog>+</template>+<script lang="ts" setup>+import { reactive, ref, computed, watch, nextTick, getCurrentInstance, ComponentInternalInstance } from 'vue'+import { hookComponent } from '@/components/system/index'+import { addPrintSolution, updatePrintSolution } from '@/api/base/printSolution'+import { PrintSolutionVO } from '@/types/Base/PrintSolution'+import i18n from '@/languages/i18n'+import preViewDialog from '@/components/hiprint/preView.vue'+import { PRINT_MENU } from '@/constant/print'++const logoRef = ref()+const { appContext } = getCurrentInstance() as ComponentInternalInstance+const proxy = appContext.config.globalProperties+const { hiprint } = proxy+const emit = defineEmits(['close', 'saveSuccess'])++interface paperTypeData {+ width: number+ height: number+}+interface tableInterFace {+ name: string+ field: string+ columns: Array<string>+}+interface selectInterFace {+ value: string+ label: string+ form: any+}+const props = defineProps<{+ showDialog: boolean+ form: PrintSolutionVO+}>()+const isShow = computed(() => props.showDialog)+const preViewDialogRef = ref()+const data = reactive({+ form: {+ id: 0,+ solution_name: '',+ config_json: '',+ report_length: 0,+ report_width: 0,+ report_direction: 'A4',+ tenant_id: 0+ } as PrintSolutionVO,+ table: [] as tableInterFace[],+ i18nName: '',+ pageForm: {} as any,+ hiprintTemplate: {} as any,+ mode: '',+ modeList: [] as string[],+ pageList: [] as selectInterFace[],+ // 当前纸张+ curPaper: {+ type: 'A4',+ width: 210,+ height: 296.6+ },+ // 纸张类型+ paperTypes: {+ A3: {+ width: 420,+ height: 296.6+ },+ A4: {+ width: 210,+ height: 296.6+ },+ A5: {+ width: 210,+ height: 147.6+ },+ B3: {+ width: 500,+ height: 352.6+ },+ B4: {+ width: 250,+ height: 352.6+ },+ B5: {+ width: 250,+ height: 175.6+ }+ },+ scaleValue: 1,+ scaleMax: 5,+ scaleMin: 0.5,+ panel: {}+})++const method = reactive({+ provider() {+ const elementList = [+ new hiprint.PrintElementTypeGroup(i18n.global.t('system.hiprint.routine'), [+ {+ tid: 'providerModule.customText',+ title: i18n.global.t('system.hiprint.text'),+ customText: i18n.global.t('system.hiprint.text'),+ custom: true,+ type: 'text'+ },+ {+ tid: 'providerModule.image',+ title: 'Logo',+ custom: true,+ type: 'image'+ }+ ])+ ]+ const userList = [] as any[]+ for (const key in data.pageForm) {+ const i18nName = `${ data.i18nName }.${ key }`+ const labelName = i18n.global.t(i18nName)+ if (labelName !== i18nName && !key.includes('detailList')) {+ userList.push({+ tid: `providerModule.${ key }`,+ title: labelName,+ data: labelName,+ type: 'text',+ options: {+ field: key,+ testData: labelName,+ height: 16,+ fontSize: 6.75,+ fontWeight: '700',+ textAlign: 'left',+ textContentVerticalAlign: 'middle'+ }+ })+ }+ }+ let index = 1+ data.table.forEach((item) => {+ const object = {+ tid: `providerModule.table${ index.toString() }`,+ title: item.name,+ type: 'table',+ options: {+ field: item.field,+ fields: [{ text: '名称', field: 'NAME' }]+ },+ editable: true,+ columnDisplayEditable: true, // 列显示是否能编辑+ columnDisplayIndexEditable: true, // 列顺序显示是否能编辑+ columnTitleEditable: true, // 列标题是否能编辑+ columnResizable: true, // 列宽是否能调整+ columnAlignEditable: true, // 列对齐是否调整+ columns: [[{ title: '部门', align: 'center', field: 'dept', width: 50 }]]+ }+ object.columns[0] = []+ object.options.fields = []+ item.columns.forEach((col) => {+ const i18nName = `${ data.i18nName }.${ col }`+ const labelName = i18n.global.t(i18nName)+ if (i18nName !== labelName) {+ object.columns[0].push({ title: labelName, align: 'center', field: col, width: 50 })+ object.options.fields.push({ text: labelName, field: col })+ }+ })+ userList.push(object)+ index += 1+ })+ if (userList.length > 0) {+ elementList.push(new hiprint.PrintElementTypeGroup(i18n.global.t('system.hiprint.field'), userList))+ }+ elementList.push(+ new hiprint.PrintElementTypeGroup(i18n.global.t('system.hiprint.auxiliary'), [+ {+ tid: 'providerModule.hline',+ title: i18n.global.t('system.hiprint.hline'),+ type: 'hline'+ },+ {+ tid: 'providerModule.vline',+ title: i18n.global.t('system.hiprint.vline'),+ type: 'vline'+ },+ {+ tid: 'providerModule.rect',+ title: i18n.global.t('system.hiprint.rect'),+ type: 'rect'+ },+ {+ tid: 'providerModule.oval',+ title: i18n.global.t('system.hiprint.oval'),+ type: 'oval'+ }+ ])+ )+ const addElementTypes = function (context: any) {+ context.removePrintElementTypes('providerModule')+ context.addPrintElementTypes('providerModule', elementList)+ }+ return {+ addElementTypes+ }+ },+ initProvier() {+ hiprint.init({+ providers: [method.provider()]+ })+ // $('.hiprintEpContainer').empty()+ const dom = document.getElementById('hiprintEpContainer')+ if (dom !== null) {+ dom.innerHTML = ''+ }+ hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'providerModule')+ },+ initTemplate() {+ // const provider = providers[0]+ // $('#hiprint-printTemplate').empty()+ const dom = document.getElementById('hiprint-printTemplate')+ if (dom !== null) {+ dom.innerHTML = ''+ }+ data.hiprintTemplate = new hiprint.PrintTemplate({+ template: data.panel,+ dataMode: 1, // 1:getJson 其他:getJsonTid 默认1+ history: false, // 是否需要 撤销重做功能+ // onDataChanged: (type, json) => {+ // console.log(type) // 新增、移动、删除、修改(参数调整)、大小、旋转+ // console.log(json) // 返回 template+ // // 更新模板+ // // hiprintTemplate.update(json)+ // // console.log(hiprintTemplate.historyList)+ // },+ onImageChooseClick: (target) => {+ // 创建input,模拟点击,然后 target.refresh 更新+ const input = document.createElement('input')+ input.setAttribute('type', 'file')+ input.click()+ input.onchange = function (evnt: any) {+ const file = evnt?.target?.files[0]+ if (file) {+ const reader = new FileReader()+ // 通过文件流行文件转换成Base64字行串+ reader.readAsDataURL(file)+ // 转换成功后+ reader.onloadend = function () {+ // 通过 target.refresh 更新图片元素+ target.refresh(reader.result)+ }+ }+ }+ input.remove()+ },+ settingContainer: '#PrintElementOptionSetting',+ paginationContainer: '.hiprint-printPagination'+ })+ data.hiprintTemplate.design('#hiprint-printTemplate')+ },+ handleSetPaper(type: string, value: paperTypeData) {+ try {+ if (Object.keys(data.paperTypes).includes(type)) {+ data.curPaper = { type, width: value.width, height: value.height }+ } else {+ data.curPaper = { type: 'other', width: value.width, height: value.height }+ }+ if (data.hiprintTemplate) {+ data.hiprintTemplate.setPaper(value.width, value.height)+ }+ } catch (error) {+ // console.log(error)+ }+ },+ handleChangeScale(big: boolean) {+ let scaleValue = data.scaleValue+ if (big) {+ scaleValue += 0.1+ if (scaleValue > data.scaleMax) scaleValue = 5+ } else {+ scaleValue -= 0.1+ if (scaleValue < data.scaleMin) scaleValue = 0.5+ }+ scaleValue = Number(scaleValue.toFixed(1))+ if (data.hiprintTemplate) {+ // scaleValue: 放大缩小值, false: 不保存(不传也一样), 如果传 true, 打印时也会放大+ data.hiprintTemplate.zoom(scaleValue, true)+ data.scaleValue = scaleValue+ }+ },+ handleChangePath() {+ data.form.tab_page = ''+ method.initPageList()+ },+ initPageList() {+ data.pageList = []+ const option = PRINT_MENU.filter((item) => item.vue_path === data.form.vue_path)+ if (option.length > 0) {+ data.i18nName = option[0].i18nName+ data.pageList = option[0].children.map((item) => {+ let label = item.tab_page+ if (item.tab_page === option[0].vue_path) {+ label = i18n.global.t(`router.sideBar.${ item.tab_page }`)+ } else {+ label = i18n.global.t(`${ data.i18nName }.${ item.tab_page }`)+ }+ return { value: item.tab_page, label, form: item.form }+ })+ }+ },+ handleChangePage() {+ const option = data.pageList.filter((item) => item.value === data.form.tab_page)+ data.table = []+ if (option.length > 0) {+ data.pageForm = option[0].form+ for (const key in data.pageForm) {+ if (key.indexOf('detailList') > -1) {+ const detailList = data.pageForm[key]+ const name = i18n.global.t(`${ data.i18nName }.${ detailList.name }`)+ data.table.push({ name, field: key, columns: detailList.columns })+ }+ }+ }+ method.initProvier()+ method.initTemplate()+ },+ async handleSubmit() {+ if (data.hiprintTemplate) {+ const jsonOut = JSON.stringify(data.hiprintTemplate.getJson() || {})+ const form = {+ id: data.form.id,+ vue_path: data.form.vue_path,+ tab_page: data.form.tab_page,+ solution_name: data.form.solution_name,+ config_json: jsonOut,+ report_length: data.curPaper.height,+ report_width: data.curPaper.width,+ report_direction: data.curPaper.type,+ tenant_id: 0+ } as PrintSolutionVO++ const { data: res } = form.id === 0 ? await addPrintSolution(form) : await updatePrintSolution(form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ }+ },+ handleClose() {+ emit('close')+ },+ handlePreView() {+ const ref = preViewDialogRef.value+ ref.data.width = data.curPaper.width+ ref.data.hiprintTemplate = data.hiprintTemplate+ const printData = {}+ for (const key in data.pageForm) {+ if (!key.includes('detailList')) {+ let value = key+ const i18nName = `${ data.i18nName }.${ key }`+ const labelName = i18n.global.t(i18nName)+ if (labelName !== i18nName) {+ value = labelName+ }+ printData[key] = value+ } else {+ const detailList = data.pageForm[key]+ const obj = {}+ detailList.columns.forEach((col) => {+ const i18nName = `${ data.i18nName }.${ col }`+ const labelName = i18n.global.t(i18nName)+ if (i18nName !== labelName) {+ obj[col] = labelName+ } else {+ obj[col] = col+ }+ })+ printData[key] = [obj]+ }+ }+ ref.data.printData = printData+ ref.method.show()+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ nextTick(() => {+ if (props.form.id > 0) {+ data.form = props.form+ if (data.form.config_json) {+ data.panel = JSON.parse(data.form.config_json)+ } else {+ data.panel = {}+ }+ method.initPageList()+ method.handleChangePage()+ if (Object.keys(data.paperTypes).includes(data.form.report_direction)) {+ data.curPaper = {+ type: data.form.report_direction,+ width: data.paperTypes[data.form.report_direction].width,+ height: data.paperTypes[data.form.report_direction].height+ }+ method.handleSetPaper(data.curPaper.type, data.curPaper)+ }+ } else {+ data.form = {+ id: 0,+ solution_name: '',+ config_json: '',+ report_length: 0,+ report_width: 0,+ report_direction: 'st',+ tenant_id: 0+ } as PrintSolutionVO+ data.curPaper = {+ type: 'A4',+ width: 210,+ height: 296.6+ }+ method.handleSetPaper(data.curPaper.type, data.curPaper)+ const dom = document.getElementById('hiprintEpContainer')+ if (dom !== null) {+ dom.innerHTML = ''+ }+ const dom1 = document.getElementById('hiprint-printTemplate')+ if (dom1 !== null) {+ dom1.innerHTML = ''+ }+ data.panel = {}+ }+ })+ }+ }+)+const scaleValueStr = computed(() => {+ let scaleValue = data.scaleValue * 100+ scaleValue = Number(scaleValue.toFixed(0))+ return scaleValue+})+const curPaperType = computed(() => {+ let type = 'other'+ const types = data.paperTypes+ for (const key in types) {+ const item = types[key]+ const { width, height } = data.curPaper+ if (item.width === width && item.height === height) {+ type = key+ }+ }+ return type+})+const menuList = computed(() => PRINT_MENU.map((item) => ({ value: item.vue_path, label: i18n.global.t(`router.sideBar.${ item.vue_path }`) })))++defineExpose({+ data+})+</script>+<style scoped lang="less">+.center-btn-box {+ margin-left: 10px;+ margin-bottom: 5px;+ display: flex;+ justify-content: start;+}++.center-box {+ height: calc(100vh - 100px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+ /* 水平居中对齐 */+}++.left-top-box {+ display: flex;+ justify-content: space-between;+ /* 水平居中对齐 */+}++.left-box {+ height: calc(100vh - 100px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+}++.right-top-box {+ display: flex;+ justify-content: flex-end;+}++.right-box {+ height: calc(100vh - 100px);+ border: 2px solid #e8e8e8;+ box-sizing: border-box;+ border-radius: 2px;+ padding: 0 5px;+ display: flex;+ justify-content: center;+}++.hiprintEpContainer {+ max-width: 200px;+}++:deep(.hiprint-printElement-type > li > ul > li > a) {+ padding: 4px 4px !important;+ color: white !important;+ background-color: #9c27b0 !important;+ font-family: 'Roboto', sans-serif !important;+ font-weight: 500 !important;+ line-height: normal !important;+ vertical-align: middle !important;+ justify-content: center !important;+ height: 30px !important;+ border-radius: 4px !important;+ border-style: none !important;+ text-overflow: ellipsis !important;+ font-size: 14px !important;+ box-shadow: 0 3px 1px -2px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, 0.2)),+ 0 2px 2px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.14)), 0 1px 5px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.12)) !important;+}++:deep(.hiprint-printElement-type > li > .title) {+ color: #000000de !important;+ font-family: 'Roboto', sans-serif !important;+ font-weight: 500 !important;+}++// 最右边样式,确认按钮背景色+:deep(.hiprint-option-item-settingBtn) {+ background: #9c27b0 !important;+}++// 最右边样式,删除按钮背景色+:deep(.hiprint-option-item-deleteBtn) {+ background: #8d9098 !important;+}++// 默认图片+// :deep(.hiprint-printElement-image-content) {+// img {+// content: url('@/assets/img/webLogoMini.png') !important;+// }+// }++// 设计容器+.card-design {+ overflow: hidden;+ overflow-x: auto;+ overflow-y: auto;+}+</style>diff --git a/frontend/src/view/base/print/print.vue b/frontend/src/view/base/print/print.vuenew file mode 100644index 0000000..04b0a58--- /dev/null+++ b/frontend/src/view/base/print/print.vue@@ -0,0 +1,360 @@+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="4" class="col">+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" />+ </v-col>++ <!-- Search Input -->+ <v-col cols="8" sm="8">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.vue_path"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.printSolution.vue_path')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <!-- <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.tab_page"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.printSolution.tab_page')"+ variant="solo"+ >+ </v-text-field>+ </v-col> -->+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.solution_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.printSolution.solution_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table+ ref="xTable"+ :data="data.tableData"+ :column-config="{+ minWidth: '100px'+ }"+ :height="tableHeight"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="checkbox" width="50" fixed="left"></vxe-column>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="vue_path" :title="$t('base.printSolution.vue_path')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.sku_name }}</span>+ <span v-else>{{ $t(`router.sideBar.${row.vue_path}`) }}</span>+ </template>+ </vxe-column>+ <!-- <vxe-column field="tab_page" :title="$t('base.printSolution.tab_page')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.unit }}</span>+ <span v-else>{{ row.tab_page }}</span>+ </template>+ </vxe-column> -->+ <vxe-column field="solution_name" width="150px" :title="$t('base.printSolution.solution_name')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.sku_code }}</span>+ <span v-else>{{ row.solution_name }}</span>+ </template>+ </vxe-column>+ <vxe-column+ field="operate"+ :title="$t('system.page.operate')"+ width="160px"+ :resizable="false"+ show-overflow+ >+ <template #default="{ row }">+ <div>+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="!data.authorityList.includes('delete') ? '' : errorColor"+ :disabled="!data.authorityList.includes('delete')"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-card-text>+ </v-card>+ </div>+ <!-- Add or modify data mode window -->+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, onMounted, reactive, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, PrintSolutionVO } from '@/types/Base/PrintSolution'+import { getPrintSolutionList, deletePrintSolution } from '@/api/base/printSolution'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-print.vue'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'++const xTable = ref()++const data: DataProps = reactive({+ searchForm: {+ vue_path: '',+ tab_page: '',+ solution_name: '',+ },+ timer: null,+ tableData: [],+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ vue_path: '',+ tab_page: '',+ solution_name: '',+ config_json: '',+ report_length: 0,+ report_width: 0,+ report_direction: 'st',+ tenant_id: 0+ },+ btnList: [],+ authorityList: getMenuAuthorityList(),+ selectRowData: []+})++const method = reactive({+ // Check if the checkbox can be checked+ getCheckBoxDisableState: ({ row }: { row: any }): boolean => row.parent_id,+ selectAllEvent({ checked }) {+ const records = xTable.value.getCheckboxRecords()+ checked ? (data.selectRowData = records) : (data.selectRowData = [])+ },+ selectChangeEvent() {+ data.selectRowData = xTable.value.getCheckboxRecords()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getCompanyList()+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ const { data: res } = await getPrintSolutionList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ vue_path: '',+ tab_page: '',+ solution_name: '',+ config_json: '',+ report_length: 0,+ report_width: 0,+ report_direction: ''+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getCompanyList()+ },+ editRow(row: PrintSolutionVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: PrintSolutionVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deletePrintSolution(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.print'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ // When change paging+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ })+})++onMounted(async () => {+ await method.getCompanyList()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/base/roleMenu/actionList.ts b/frontend/src/view/base/roleMenu/actionList.tsnew file mode 100644index 0000000..63eca20--- /dev/null+++ b/frontend/src/view/base/roleMenu/actionList.ts@@ -0,0 +1,97 @@+import i18n from '@/languages/i18n'++export const actionDict: any = {+ companySetting: ['save', 'delete', 'export'],+ userRoleSetting: ['save', 'delete', 'export'],+ roleMenu: [],+ userManagement: ['save', 'delete', 'import', 'export', 'resetPwd'],+ commodityCategorySetting: ['save', 'delete', 'export'],+ commodityManagement: ['save', 'delete', 'export', 'saftyStock', 'printQrCode', 'printBarCode'],+ supplier: ['save', 'delete', 'import', 'export'],+ print: ['save', 'delete', 'export'],+ warehouseSetting: [+ 'warehouse-save',+ 'warehouse-delete',+ 'warehouse-import',+ 'warehouse-export',+ 'area-save',+ 'area-delete',+ 'area-export',+ 'location-save',+ 'location-delete',+ 'location-export',+ 'location-printBarCode',+ 'location-printQrCode'+ ],+ ownerOfCargo: ['save', 'delete', 'import', 'export'],+ freightSetting: ['save', 'delete', 'import', 'export'],+ customer: ['save', 'delete', 'import', 'export'],++ stockAsn: [+ 'notice-save',+ 'notice-delete',+ 'notice-export',+ 'notice-printQrCode',+ 'delivered-confirm',+ 'delivered-export',+ 'unloaded-confirm',+ 'unloaded-delete',+ 'unloaded-export',+ 'sorted-editCount',+ 'sorted-confirm',+ 'sorted-delete',+ 'sorted-export',+ 'putOnTheShelf-editArrival',+ 'putOnTheShelf-delete',+ 'putOnTheShelf-export',+ 'detail-export'+ ],++ stockManagement: ['area-export', 'stock-export'],+ saftyStock: ['export'],+ asnStatistic: ['export'],+ deliveryStatistic: ['export'],++ warehouseProcessing: ['split', 'group', 'confirmOpeartion', 'confirmAdjust', 'delete', 'export'],+ warehouseMove: ['save', 'delete', 'export', 'confirm'],+ warehouseFreeze: ['freeze', 'unfreeze', 'export'],+ warehouseAdjust: ['export'],+ warehouseTaking: ['save', 'delete', 'export', 'confirmOpeartion', 'confirmAdjust'],++ deliveryManagement: [+ 'invoice-save',+ 'invoice-confirm',+ 'invoice-revoke',+ 'invoice-delete',+ 'invoice-export',+ 'invoice-printQrCode',+ 'picked-confirm',+ 'picked-revoke',+ 'picked-export',+ 'packaged-package',+ 'packaged-export',+ 'packaged-revoke',+ 'weighed-weigh',+ 'weighed-export',+ 'weighed-revoke',+ 'delivered-delivery',+ 'delivered-setCarrier',+ 'delivered-signIn',+ 'delivered-export',+ 'signedIn-export'+ ]+}++// Get operation name+export const getActionName = (item: string, menu_name?: string) => {+ let titleKey = item++ let titleFun = ''+ if (titleKey.includes('-')) {+ titleFun = `${ i18n.global.t(`base.roleMenu.opeartionFunctionName.${ menu_name }.${ titleKey.split('-')[0] }`) }-`++ titleKey = titleKey.split('-')[1]+ }++ return `${ titleFun }${ i18n.global.t(`base.roleMenu.operationTitle.${ titleKey }`) }`+}diff --git a/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vueindex ad96c2b..6bc01bc 100644--- a/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue+++ b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue@@ -1,35 +1,37 @@<template>- <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <v-dialog v-model="isShow" :persistent="true" :width="'30%'" transition="dialog-top-transition"><template #default><v-card class="formCard">- <v-toolbar color="white" :title="`${$t('router.sideBar.roleMenu')}`"></v-toolbar>+ <v-toolbar :title="`${$t('router.sideBar.roleMenu')}`" color="white"></v-toolbar><v-card-text><v-form ref="formRef"><v-selectv-model="data.form.userrole_id"+ :disabled="data.dialogTitle === 'update'":items="data.combobox.role_name"- item-title="label"- item-value="value"- :rules="data.rules.role_name":label="$t('base.roleMenu.role_name')"- variant="outlined"- :disabled="data.dialogTitle === 'update'"+ :rules="data.rules.role_name"clearable- ></v-select>- <v-select- v-model="data.menusSelectedList"- :items="data.combobox.menu_name"- :menu-props="{ maxHeight: 400 }"item-title="label"item-value="value"- :label="$t('base.roleMenu.menu_name')"variant="outlined"- chips- multiple- clearable- >- </v-select>+ ></v-select></v-form>+ <vxe-table+ ref="xTable"+ :checkbox-config="{checkRowKeys: data.menusSelectedList}"+ :data="data.combobox.menu_name"+ :radio-config="{labelField: 'value'}"+ :row-config="{isHover: true, keyField:'value'}"+ align="center"+ max-height="500"+ row-id="value"+ @checkbox-all="method.selectAllEvent"+ @checkbox-change="method.selectChangeEvent"+ >+ <vxe-column type="checkbox" width="60"></vxe-column>+ <vxe-column :title="$t('base.roleMenu.menu_name')" field="label"></vxe-column>+ </vxe-table></v-card-text><v-card-actions class="justify-end"><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>@@ -41,14 +43,15 @@</template><script lang="ts" setup>-import { reactive, computed, ref, watch } from 'vue'-import { RoleMenuVO, RoleMenuDetailVo } from '@/types/Base/RoleMenu'+import { computed, reactive, ref, watch } from 'vue'+import { RoleMenuDetailVo, RoleMenuVO } from '@/types/Base/RoleMenu'import { UserRoleVO } from '@/types/Base/UserRoleSetting'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'-import { addRoleMenu, updateRoleMenu, getMenus } from '@/api/base/roleMenu'+import { addRoleMenu, getMenus, updateRoleMenu } from '@/api/base/roleMenu'import { getUserRoleAll } from '@/api/base/userRoleSetting'import { MenuItem } from '@/types/System/Store'+import { actionDict } from './actionList'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -57,9 +60,8 @@ const props = defineProps<{showDialog: booleanform: RoleMenuVO}>()-const isShow = computed(() => props.showDialog)-+const xTable = ref()const data = reactive({dialogTitle: '',form: ref<RoleMenuVO>({@@ -80,6 +82,7 @@ const data = reactive({menu_name: {label: stringvalue: number+ menu_name: string}[]}>({role_name: [],@@ -117,18 +120,24 @@ const method = reactive({value: role.id})}- data.combobox.menu_name = []+ // data.combobox.menu_name = []const { data: menuRes } = await getMenus()if (!menuRes.isSuccess) {return}const menus: MenuItem[] = menuRes.data- for (const menu of menus) {- data.combobox.menu_name.push({- label: i18n.global.t(`router.sideBar.${ menu.menu_name }`),- value: menu.id- })- }+ // for (const menu of menus) {+ // data.combobox.menu_name.push({+ // label: i18n.global.t(`router.sideBar.${ menu.menu_name }`),+ // value: menu.id,+ // menu_name: menu.menu_name+ // })+ // }+ data.combobox.menu_name = menus.map(item => ({+ label: i18n.global.t(`router.sideBar.${ item.menu_name }`),+ value: item.id,+ menu_name: item.menu_name+ }))},closeDialog: () => {emit('close')@@ -141,7 +150,8 @@ const method = reactive({if (data.form.detailList.findIndex((dl) => dl.menu_id === item) < 0) {data.form.detailList.push({id: 0,- menu_id: item+ menu_id: item,+ menu_actions_authority: []})}}@@ -169,9 +179,23 @@ const method = reactive({}const { valid } = await formRef.value.validate()if (valid) {+ const form = { ...data.form }++ form.detailList = form.detailList.map((item: RoleMenuDetailVo) => {+ if (!item.id || item.id === 0) {+ const index = data.combobox.menu_name.findIndex((fi: { value: number }) => fi.value === item.menu_id)++ item.menu_actions_authority = index > -1 ? actionDict[data.combobox.menu_name[index].menu_name] : []+ }+ return item+ })+const { data: res } = data.dialogTitle === 'add'- ? await addRoleMenu(data.form)- : await updateRoleMenu({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] }) // Merge the deleted list and the original list+ ? await addRoleMenu(form)+ : await updateRoleMenu({+ ...form,+ detailList: [...form.detailList, ...data.removeDetailList]+ }) // Merge the deleted list and the original listif (!res.isSuccess) {hookComponent.$message({type: 'error',@@ -190,11 +214,20 @@ const method = reactive({content: i18n.global.t('system.checkText.checkFormFail')})}+ },+ selectAllEvent: ({ checked }) => {+ checked+ ? data.menusSelectedList = data.combobox.menu_name.map(item => item.value)+ : data.menusSelectedList = []+ },+ selectChangeEvent: () => {+ const records = xTable.value.getCheckboxRecords()+ data.menusSelectedList = records.map(item => item.value)}})watch(- () => isShow.value,+ () => props.showDialog,(val) => {if (val) {method.getDialogType()@@ -206,4 +239,4 @@ watch()</script>-<style scoped lang="less"></style>+<style lang="less" scoped></style>diff --git a/frontend/src/view/base/roleMenu/edit-menu-action.vue b/frontend/src/view/base/roleMenu/edit-menu-action.vuenew file mode 100644index 0000000..e2d44e9--- /dev/null+++ b/frontend/src/view/base/roleMenu/edit-menu-action.vue@@ -0,0 +1,104 @@+<template>+ <v-dialog v-model="data.showDialog" :persistent="true" :width="'30%'" transition="dialog-top-transition">+ <template #default>+ <v-card class="formCard">+ <v-toolbar :title="`${$t('base.roleMenu.modalTitle.editMenuAction')}`" color="white"></v-toolbar>+ <v-card-text>+ <!-- <v-form ref="formRef">-->+ <!-- <v-select-->+ <!-- v-model="data.actions"-->+ <!-- :items="currentActionList"-->+ <!-- :menu-props="{ maxHeight: 400 }"-->+ <!-- item-title="label"-->+ <!-- item-value="value"-->+ <!-- :label="$t('base.roleMenu.modalTitle.actionTitle')"-->+ <!-- variant="outlined"-->+ <!-- chips-->+ <!-- multiple-->+ <!-- clearable-->+ <!-- >-->+ <!-- </v-select>-->+ <!-- </v-form>-->+ <vxe-table+ ref="xTable"+ :checkbox-config="{checkRowKeys: data.actions}"+ :data="currentActionList"+ :radio-config="{labelField: 'value'}"+ :row-config="{isHover: true, keyField:'value'}"+ align="center"+ row-id="value"+ max-height="500"+ @checkbox-all="method.selectAllEvent"+ @checkbox-change="method.selectChangeEvent"+ >+ <vxe-column type="checkbox" width="60"></vxe-column>+ <vxe-column :title="$t('base.roleMenu.modalTitle.actionTitle')" field="label"></vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.saveSuccess">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="tsx" setup>+import { computed, reactive, ref } from 'vue'+import { actionDict, getActionName } from './actionList'+import { RoleMenuDetailVo } from '@/types/Base/RoleMenu'++const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ row: RoleMenuDetailVo+}>()++const currentActionList = computed(() => {+ if (props.row.menu_name && Object.hasOwn(actionDict, props.row.menu_name)) {+ return actionDict[props.row.menu_name].map((item: string) => ({+ label: getActionName(item, props.row.menu_name),+ value: item+ }))+ }+ return []+})++const xTable = ref()++const data = reactive({+ actions: [] as string[],+ showDialog: false as boolean+})++const method = reactive({+ openDialog: (cache: string[]) => {+ data.actions = []+ data.actions = cache+ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ saveSuccess: () => {+ emit('saveSuccess', data.actions)+ },+ selectAllEvent: ({ checked }) => {+ checked+ ? data.actions = currentActionList.value.map(item => item.value)+ : data.actions = []+ },+ selectChangeEvent: () => {+ const records = xTable.value.getCheckboxRecords()+ data.actions = records.map(item => item.value)+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style lang="less" scoped></style>diff --git a/frontend/src/view/base/roleMenu/roleMenu.vue b/frontend/src/view/base/roleMenu/roleMenu.vueindex 35a7cb1..af5f2d2 100644--- a/frontend/src/view/base/roleMenu/roleMenu.vue+++ b/frontend/src/view/base/roleMenu/roleMenu.vue@@ -7,16 +7,18 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editForm()"></tooltip-btn><tooltip-btn icon="mdi-delete-outline" :tooltip-text="$t('system.page.delete')" @click="method.deleteForm()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>- <!-- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->++ <BtnGroup :authority-list="[]" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><!-- <v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="12" sm="4"><v-text-field@@ -80,16 +82,72 @@</v-card></v-col><v-col :cols="9">- <vxe-table ref="xTable" :data="data.activeRoleMenuForm.detailList" :height="tableHeight" align="center">+ <vxe-table+ ref="xTable"+ :data="data.activeRoleMenuForm.detailList"+ :tree-config="{ transform: true }"+ :height="tableHeight"+ align="center"+ ><template #empty>{{ i18n.global.t('system.page.noData') }}</template>- <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="expand" width="60">+ <template #header>+ <div+ style="height: 100%; display: flex; align-items: center; justify-content: center; cursor: pointer"+ @click="method.expandAllRows()"+ >+ <v-tooltip location="bottom">+ <template #activator="{ props }">+ <div v-bind="props">+ <v-icon v-if="!isExpandAll" size="large">mdi-chevron-right</v-icon>+ <v-icon v-else size="large">mdi-chevron-down</v-icon>+ </div>+ </template>+ <span>{{ $t('base.roleMenu.expandRow') }}</span>+ </v-tooltip>+ </div>+ </template>+ <template #content="{ row }">+ <div v-if="row.menu_actions_authority.length > 0" style="margin: 10px 0; display: flex; align-items: center">+ <div style="white-space: nowrap"> {{ $t('base.roleMenu.operation') }}: </div>+ <div>+ <v-chip v-for="(item, index) of row.menu_actions_authority" :key="index" color="primary" size="small">+ {{ getActionName(item, row.menu_name) }}+ </v-chip>+ </div>+ </div>+ <div v-else style="color: #b9b7b7; margin: 10px 0; display: flex; align-items: center; justify-content: center">+ {{ $t('base.roleMenu.dataEmpty') }}+ </div>+ </template>+ </vxe-column>+ <!-- <vxe-column type="seq" width="60"></vxe-column> --><vxe-column field="menu_name" :title="$t('base.roleMenu.menu_name')"><template #default="{ row }"><span>{{ $t(`router.sideBar.${row.menu_name}`) }}</span></template></vxe-column>+ <!-- <vxe-column field="menu_name" :title="$t('base.roleMenu.operation')">+ <template #default="{ row }">+ <v-chip v-for="(item, index) of row.menu_actions_authority" :key="index" color="primary" size="small">+ {{ getActionName(item, row.menu_name) }}+ </v-chip>+ </template>+ </vxe-column> -->+ <vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit') + $t('base.roleMenu.operation')"+ @click="method.handleEditAction(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column></vxe-table></v-col></v-row>@@ -99,22 +157,28 @@</div><!-- Add or modify data mode window --><addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <!-- Edit menu permissions -->+ <edit-menu-action ref="editMenuActionRef" :row="data.editMenuDialogCurrentRow" @saveSuccess="method.editMenuSaveSuccess" /></div></template><script lang="ts" setup>import { computed, reactive, onMounted, ref } from 'vue'import { computedCardHeight, computedTableHeight } from '@/constant/style'-import tooltipBtn from '@/components/tooltip-btn.vue'-import { DataProps, RoleMenuVO } from '@/types/Base/RoleMenu'-import { getRoleMenuAll, getRoleMenuById, deleteRoleMenu } from '@/api/base/roleMenu'+import { DataProps, RoleMenuVO, RoleMenuDetailVo } from '@/types/Base/RoleMenu'+import { getRoleMenuAll, getRoleMenuById, deleteRoleMenu, updateRoleMenu } from '@/api/base/roleMenu'import { hookComponent } from '@/components/system'import addOrUpdateDialog from './add-or-update-role-menu.vue'import i18n from '@/languages/i18n'import NavListVue from '@/components/page/nav-list.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import TooltipBtn from '@/components/tooltip-btn.vue'+import EditMenuAction from './edit-menu-action.vue'+import { getActionName } from './actionList'const xTable = ref()+const editMenuActionRef = ref()const data: DataProps = reactive({navListOptions: {@@ -139,10 +203,44 @@ const data: DataProps = reactive({showDialog: false,dialogForm: {detailList: []+ },+ // operating button+ btnList: [],+ editMenuDialogCurrentRow: {+ id: -1,+ menu_id: -1,+ menu_name: '',+ menu_actions_authority: []}})const method = reactive({+ // Editing completed+ editMenuSaveSuccess: async (actions: string[]) => {+ const { data: res } = await updateRoleMenu({+ ...data.activeRoleMenuForm,+ detailList: [{ ...data.editMenuDialogCurrentRow, menu_actions_authority: actions }]+ })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ editMenuActionRef.value.closeDialog()+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.update') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ },+ // Modify menu operation permissions+ handleEditAction: (row: RoleMenuDetailVo) => {+ data.editMenuDialogCurrentRow = row++ editMenuActionRef.value.openDialog(row.menu_actions_authority)+ },sureSearch: () => {// console.log(data.searchForm)},@@ -272,11 +370,57 @@ const method = reactive({}data.navListOptions.indexValue = String(item.userrole_id)method.getRoleMenus(item.userrole_id)+ },+ // Expand All Rows+ expandAllRows: () => {+ const expandRows = xTable.value.getRowExpandRecords()++ if (expandRows.length === data.activeRoleMenuForm.detailList.length) {+ xTable.value.setAllRowExpand(false)+ } else {+ xTable.value.setAllRowExpand(true)+ }}})onMounted(async () => {await method.getCompanyList()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: '',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.edit'),+ icon: 'mdi-pencil-outline',+ code: '',+ click: method.editForm+ },+ {+ name: i18n.global.t('system.page.delete'),+ icon: 'mdi-delete-outline',+ code: '',+ click: method.deleteForm+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ }+ ]+})++const isExpandAll = computed(() => {+ const expandRows = xTable.value.getRowExpandRecords()++ if (expandRows.length === data.activeRoleMenuForm.detailList.length) {+ return true+ }+ return false})const cardHeight = computed(() => computedCardHeight({ hasTab: false }))@@ -318,4 +462,7 @@ const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager.activeRow {background-color: #9156fd;}+.v-chip {+ margin: 3px 5px;+}</style>diff --git a/frontend/src/view/base/supplier/import-supplier-table.vue b/frontend/src/view/base/supplier/import-supplier-table.vueindex 2d5bc32..0fbbf68 100644--- a/frontend/src/view/base/supplier/import-supplier-table.vue+++ b/frontend/src/view/base/supplier/import-supplier-table.vue@@ -159,12 +159,12 @@ const method = reactive({data.importData = []ws.forEach((value: any, index: number, ws: any) => {data.importData.push({- supplier_name: ws[index][i18n.global.t('base.supplier.supplier_name')] ? ws[index][i18n.global.t('base.supplier.supplier_name')] + '' : '',- city: ws[index][i18n.global.t('base.supplier.city')] ? ws[index][i18n.global.t('base.supplier.city')] + '' : '',- address: ws[index][i18n.global.t('base.supplier.address')] ? ws[index][i18n.global.t('base.supplier.address')] + '' : '',- manager: ws[index][i18n.global.t('base.supplier.manager')] ? ws[index][i18n.global.t('base.supplier.manager')] + '' : '',- email: ws[index][i18n.global.t('base.supplier.email')] ? ws[index][i18n.global.t('base.supplier.email')] + '' : '',- contact_tel: ws[index][i18n.global.t('base.supplier.contact_tel')] ? ws[index][i18n.global.t('base.supplier.contact_tel')] + '' : ''+ supplier_name: ws[index][i18n.global.t('base.supplier.supplier_name')] ? `${ ws[index][i18n.global.t('base.supplier.supplier_name')] }` : '',+ city: ws[index][i18n.global.t('base.supplier.city')] ? `${ ws[index][i18n.global.t('base.supplier.city')] }` : '',+ address: ws[index][i18n.global.t('base.supplier.address')] ? `${ ws[index][i18n.global.t('base.supplier.address')] }` : '',+ manager: ws[index][i18n.global.t('base.supplier.manager')] ? `${ ws[index][i18n.global.t('base.supplier.manager')] }` : '',+ email: ws[index][i18n.global.t('base.supplier.email')] ? `${ ws[index][i18n.global.t('base.supplier.email')] }` : '',+ contact_tel: ws[index][i18n.global.t('base.supplier.contact_tel')] ? `${ ws[index][i18n.global.t('base.supplier.contact_tel')] }` : ''})})}diff --git a/frontend/src/view/base/supplier/supplier.vue b/frontend/src/view/base/supplier/supplier.vueindex 5f57e17..6a61130 100644--- a/frontend/src/view/base/supplier/supplier.vue+++ b/frontend/src/view/base/supplier/supplier.vue@@ -10,16 +10,19 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn><tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="12" sm="4"></v-col><v-col cols="12" sm="4"></v-col>@@ -47,7 +50,15 @@height: cardHeight}">- <vxe-table ref="xTable" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table+ ref="xTable"+ :column-config="{+ minWidth: '100px'+ }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ ><template #empty>{{ i18n.global.t('system.page.noData') }}</template>@@ -60,15 +71,14 @@<vxe-column field="email" :title="$t('base.supplier.email')"></vxe-column><vxe-column field="contact_tel" :title="$t('base.supplier.contact_tel')"></vxe-column><vxe-column field="creator" :title="$t('base.supplier.creator')"></vxe-column>- <vxe-column field="create_time" :title="$t('base.supplier.create_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column field="create_time" width="170px" :formatter="['formatDate', 'yyyy-MM-dd HH:mm']" :title="$t('base.supplier.create_time')"></vxe-column>- <vxe-column field="last_update_time" :title="$t('base.supplier.last_update_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column+ field="last_update_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.supplier.last_update_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">@@ -76,13 +86,15 @@:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -113,20 +125,20 @@import { computed, ref, reactive, onMounted, watch } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'-import { SupplierVO, DataProps } from '@/types/Base/Supplier'+import { SupplierVO } from '@/types/Base/Supplier'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-supplier.vue'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import i18n from '@/languages/i18n'import { getSupplierList, deleteSupplier } from '@/api/base/supplier'import importSupplierTable from './import-supplier-table.vue'-import { formatDate } from '@/utils/format/formatSystem'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -154,7 +166,9 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])},- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ authorityList: getMenuAuthorityList() as string[]})const method = reactive({@@ -255,6 +269,33 @@ const method = reactive({}})onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.import'),+ icon: 'mdi-database-import-outline',+ code: 'import',+ click: method.openDialogImport+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+method.getData()})diff --git a/frontend/src/view/base/userManagement/add-or-update-user.vue b/frontend/src/view/base/userManagement/add-or-update-user.vueindex 00c95a4..eb73ca0 100644--- a/frontend/src/view/base/userManagement/add-or-update-user.vue+++ b/frontend/src/view/base/userManagement/add-or-update-user.vue@@ -157,10 +157,17 @@ const method = reactive({})return}- hookComponent.$message({- type: 'success',- content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`- })+ if (dialogTitle.value === 'add') {+ hookComponent.$dialog({+ content: i18n.global.t('base.userManagement.addSuccessTip') + res.errorMessage,+ handleConfirm: async () => {}+ })+ } else {+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ }emit('saveSuccess')} else {hookComponent.$message({diff --git a/frontend/src/view/base/userManagement/userManagement.vue b/frontend/src/view/base/userManagement/userManagement.vueindex ba84957..9c40168 100644--- a/frontend/src/view/base/userManagement/userManagement.vue+++ b/frontend/src/view/base/userManagement/userManagement.vue@@ -7,17 +7,13 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>- <tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport">- </tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>- <tooltip-btn icon="mdi-lock-reset" :tooltip-text="$t('base.userManagement.restPwd')" @click="method.restPwd"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="4"><v-text-field@@ -93,13 +89,15 @@:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -149,10 +147,11 @@ import addOrUpdateDialog from './add-or-update-user.vue'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import importTable from './import-table.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -179,7 +178,9 @@ const data: DataProps = reactive({contact_tel: '',auth_string: '',is_valid: true- }+ },+ btnList: [],+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -311,6 +312,39 @@ const method = reactive({onMounted(async () => {await method.getUserList()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.import'),+ icon: 'mdi-database-import-outline',+ code: 'import',+ click: method.openDialogImport+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('base.userManagement.restPwd'),+ icon: 'mdi-lock-reset',+ code: 'resetPwd',+ click: method.restPwd+ }+ ]})const cardHeight = computed(() => computedCardHeight({ hasTab: false }))diff --git a/frontend/src/view/base/userRoleSetting/userRoleSetting.vue b/frontend/src/view/base/userRoleSetting/userRoleSetting.vueindex db356c1..0e731cd 100644--- a/frontend/src/view/base/userRoleSetting/userRoleSetting.vue+++ b/frontend/src/view/base/userRoleSetting/userRoleSetting.vue@@ -7,14 +7,17 @@<div class="operateArea"><v-row no-gutters><!-- Operate Btn -->- <v-col cols="12" sm="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <v-col cols="12" sm="4" class="col">+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh()"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->- <v-col cols="12" sm="9">+ <v-col cols="12" sm="8"><!-- <v-row no-gutters @keyup.enter="method.sureSearch"><v-col cols="12" sm="4"><v-text-field@@ -81,13 +84,15 @@:flat="true"icon="mdi-pencil-outline":tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"@click="method.editRow(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -112,6 +117,8 @@ import { hookComponent } from '@/components/system'import addOrUpdateDialog from './add-or-update-user-role.vue'import i18n from '@/languages/i18n'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { getMenuAuthorityList } from '@/utils/common'const xTable = ref()@@ -128,7 +135,10 @@ const data: DataProps = reactive({id: 0,role_name: '',is_valid: true- }+ },+ btnList: [],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -210,6 +220,27 @@ const method = reactive({onMounted(async () => {await method.getUserRoleList()++ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]})const cardHeight = computed(() => computedCardHeight({ hasTab: false }))diff --git a/frontend/src/view/base/warehouseSetting/tab-location.vue b/frontend/src/view/base/warehouseSetting/tab-location.vueindex 9036f04..cf3292b 100644--- a/frontend/src/view/base/warehouseSetting/tab-location.vue+++ b/frontend/src/view/base/warehouseSetting/tab-location.vue@@ -3,9 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -48,9 +50,15 @@height: cardHeight}">- <vxe-table ref="xTableGoodsLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table+ ref="xTableGoodsLocation"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ >+ <vxe-column type="checkbox" width="50" fixed="left"></vxe-column><vxe-column type="seq" width="60"></vxe-column>- <vxe-column type="checkbox" width="50"></vxe-column><vxe-column field="warehouse_name" :title="$t('base.warehouseSetting.warehouse_name')"></vxe-column><vxe-column field="warehouse_area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column><vxe-column field="warehouse_area_property" :title="$t('base.warehouseSetting.area_property')">@@ -73,14 +81,35 @@<span>{{ formatIsValid(row[column.property]) }}</span></template></vxe-column>- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140px" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-qrcode"+ :tooltip-text="$t('base.commodityManagement.printQrCode')"+ :disabled="!data.authorityList.includes('location-printQrCode')"+ @click="method.printQrCode(row)"+ ></tooltip-btn> -->+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-barcode"+ :tooltip-text="$t('base.commodityManagement.printBarCode')"+ :disabled="!data.authorityList.includes('location-printBarCode')"+ @click="method.printBarCode(row)"+ ></tooltip-btn> -->+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('location-save')"+ @click="method.editRow(row)"+ ></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')":icon-color="errorColor"+ :disabled="!data.authorityList.includes('location-delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -98,28 +127,44 @@</custom-pager></div><add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />++ <!-- Print QR code -->+ <qr-code-dialog ref="qrCodeDialogRef" :menu="'warehouseSetting-location'">+ <template #left="{ slotData }">+ <p>{{ $t('base.warehouseSetting.warehouse_name') }}:{{ slotData.warehouse_name }}</p> + <p>{{ $t('base.warehouseSetting.area_name') }}:{{ slotData.warehouse_area_name }}</p> + <p>{{ $t('base.warehouseSetting.location_name') }}:{{ slotData.location_name }}</p> + </template>+ </qr-code-dialog>+ <!-- Print barcode -->+ <bar-code-dialog ref="barCodeDialogRef" :menu="'warehouseSetting-location'" /></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, onMounted, reactive, ref, watch } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { GoodsLocationVO } from '@/types/Base/Warehouse'-import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { DEFAULT_PAGE_SIZE, PAGE_LAYOUT, PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { deleteGoodsLocation, getGoodsLocationList } from '@/api/base/warehouseSetting'-import tooltipBtn from '@/components/tooltip-btn.vue'-import addOrUpdateDialog from './add-or-update-location.vue'import i18n from '@/languages/i18n'import { formatIsValid } from '@/utils/format/formatSystem'import { formatAreaProperty } from '@/utils/format/formatWarehouse'-import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'+import { getMenuAuthorityList, setSearchObject } from '@/utils/common'import { DEBOUNCE_TIME } from '@/constant/system'-import { SearchObject } from '@/types/System/Form'+import { btnGroupItem, SearchObject } from '@/types/System/Form'import { exportData } from '@/utils/exportTable'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-location.vue'+import customPager from '@/components/custom-pager.vue'+import BtnGroup from '@/components/system/btnGroup.vue'+import BarCodeDialog from '@/components/codeDialog/barCodeDialog.vue'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'const xTableGoodsLocation = ref()+const qrCodeDialogRef = ref()+const barCodeDialogRef = ref()const data = reactive({showDialog: false,@@ -151,10 +196,54 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ selectRowData: [],+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList() as string[]})const method = reactive({+ // Print QR code+ printQrCode: () => {+ const records = xTableGoodsLocation.value.getCheckboxRecords()++ // data.selectRowData.length === 0 ? (data.selectRowData = [row]) : ''+ // const records: any[] = data.selectRowData+ if (records.length > 0) {+ for (const item of records) {+ item.type = 'warehouse'+ }+ qrCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ printBarCode: () => {+ let records = xTableGoodsLocation.value.getCheckboxRecords()+ records = records.filter((item) => item.id)+ // data.selectRowData.length === 0 ? (data.selectRowData = [row]) : ''+ // let records: any[] = data.selectRowData++ if (records.length > 0) {+ barCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ selectAllEvent({ checked }) {+ const records = xTableGoodsLocation.value.getCheckboxRecords()+ checked ? (data.selectRowData = records) : (data.selectRowData = [])+ },+ selectChangeEvent() {+ data.selectRowData = xTableGoodsLocation.value.getCheckboxRecords()+ },// Open a dialog to addadd: () => {data.dialogForm = {@@ -248,6 +337,41 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'location-save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'location-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('base.commodityManagement.printQrCode'),+ icon: 'mdi-qrcode',+ code: 'location-printQrCode',+ click: method.printQrCode+ },+ {+ name: i18n.global.t('base.commodityManagement.printBarCode'),+ icon: 'mdi-barcode',+ code: 'location-printBarCode',+ click: method.printBarCode+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/base/warehouseSetting/tab-reservoir.vue b/frontend/src/view/base/warehouseSetting/tab-reservoir.vueindex 9725fb0..ed2e983 100644--- a/frontend/src/view/base/warehouseSetting/tab-reservoir.vue+++ b/frontend/src/view/base/warehouseSetting/tab-reservoir.vue@@ -3,9 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -65,12 +67,19 @@</vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('area-save')"+ @click="method.editRow(row)"+ ></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('area-delete')?'':errorColor"+ :disabled="!data.authorityList.includes('area-delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -91,7 +100,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { WarehouseAreaVO, AreaProperty } from '@/types/Base/Warehouse'@@ -104,10 +113,11 @@ import i18n from '@/languages/i18n'import { formatAreaProperty } from '@/utils/format/formatWarehouse'import { formatIsValid } from '@/utils/format/formatSystem'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'import { DEBOUNCE_TIME } from '@/constant/system'-import { SearchObject } from '@/types/System/Form'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'const xTableWarehouseArea = ref()@@ -133,7 +143,10 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList() as string[]})const method = reactive({@@ -223,6 +236,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'area-save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'area-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/base/warehouseSetting/tab-warehouse.vue b/frontend/src/view/base/warehouseSetting/tab-warehouse.vueindex 4dbce19..fabb20c 100644--- a/frontend/src/view/base/warehouseSetting/tab-warehouse.vue+++ b/frontend/src/view/base/warehouseSetting/tab-warehouse.vue@@ -3,10 +3,13 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn><tooltip-btn icon="mdi-database-import-outline" :tooltip-text="$t('system.page.import')" @click="method.openDialogImport"> </tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -70,7 +73,12 @@<vxe-column field="email" :title="$t('base.warehouseSetting.email')"></vxe-column><vxe-column field="manager" :title="$t('base.warehouseSetting.manager')"></vxe-column><vxe-column field="creator" :title="$t('base.warehouseSetting.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('base.warehouseSetting.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.warehouseSetting.create_time')"+ ></vxe-column><vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')"><template #default="{ row, column }"><span>{{ formatIsValid(row[column.property]) }}</span>@@ -78,12 +86,19 @@</vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('warehouse-save')"+ @click="method.editRow(row)"+ ></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('warehouse-delete')?'':errorColor"+ :disabled="!data.authorityList.includes('warehouse-delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -105,7 +120,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { WarehouseVO } from '@/types/Base/Warehouse'@@ -117,11 +132,12 @@ import addOrUpdateDialog from './add-or-update-warehouse.vue'import i18n from '@/languages/i18n'import { formatIsValid } from '@/utils/format/formatSystem'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import { DEBOUNCE_TIME } from '@/constant/system'-import { SearchObject } from '@/types/System/Form'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import importTable from './import-table.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTableWarehouse = ref()@@ -152,7 +168,10 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList() as string[]})const method = reactive({@@ -254,6 +273,35 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'warehouse-save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.import'),+ icon: 'mdi-database-import-outline',+ code: 'warehouse-import',+ click: method.openDialogImport+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'warehouse-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/base/warehouseSetting/warehouseSetting.vue b/frontend/src/view/base/warehouseSetting/warehouseSetting.vueindex 2f5f488..42001a1 100644--- a/frontend/src/view/base/warehouseSetting/warehouseSetting.vue+++ b/frontend/src/view/base/warehouseSetting/warehouseSetting.vue@@ -30,7 +30,7 @@</template><script lang="ts" setup>-import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import { ref, reactive, onMounted, nextTick } from 'vue'import i18n from '@/languages/i18n'import tabWarehouse from './tab-warehouse.vue'import tabReservoir from './tab-reservoir.vue'diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-allocation.vue b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-allocation.vuenew file mode 100644index 0000000..b155eb3--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-allocation.vue@@ -0,0 +1,108 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.supplier')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.dateFrom"+ type="date"+ variant="outlined"+ :label="$t('wms.deliveryBatchAllocation.dateFrom')"+ ></v-text-field>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { DeliveryBatchAllocationVO } from '@/types/DeliveryManagement/DeliveryManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: DeliveryBatchAllocationVO+}>()++const isShow = computed(() => props.showDialog)++// const dialogTitle = computed(() => {+// if (props.form.id && props.form.id > 0) {+// return 'update'+// }+// return 'add'+// })++const data = reactive({+ form: ref<DeliveryBatchAllocationVO>({+ id: 0,+ dateFrom: '',+ dateTo: '',+ allocationRule: '',+ is_valid: true+ }),+ rules: {+ dateFrom: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryBatchAllocation.dateFrom') }!`],+ dateTo: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryBatchAllocation.dateTo') }!`],+ allocationRule: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryBatchAllocation.allocationRule') }!`],+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ // const { data: res } = dialogTitle.value === 'add' ? await addSupplier(data.form) : await updateSupplier(data.form)+ // if (!res.isSuccess) {+ // hookComponent.$message({+ // type: 'error',+ // content: res.errorMessage+ // })+ // return+ // }+ // hookComponent.$message({+ // type: 'success',+ // content: `${i18n.global.t('system.page.submit')}${i18n.global.t('system.tips.success')}`+ // })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vueindex c87ef33..40a5f60 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue@@ -1,11 +1,11 @@<template>- <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <v-dialog v-model="isShow" transition="dialog-top-transition" :persistent="true"><template #default>- <v-card class="formCard">+ <v-card class="formCard" :width="dialogWidth"><v-toolbar color="white" :title="`${$t('router.sideBar.deliveryManagement')}`"></v-toolbar><v-card-text><v-form ref="formRef">- <v-select+ <!-- <v-selectv-model="data.form.customer_name":items="data.combobox.customer_name"item-title="label"@@ -15,7 +15,25 @@variant="outlined"clearable@update:model-value="method.customerNameChange"- ></v-select>+ ></v-select> -->+ <customFilterSelect+ v-model="data.form"+ :items="data.combobox.customer_name"+ item-title="label"+ :rules="data.rules.customer_name"+ :label="$t('wms.deliveryManagement.customer_name')"+ :mapping="[+ {+ in: 'customer_name',+ out: 'label'+ },+ {+ in: 'customer_id',+ out: 'value'+ }+ ]"+ />+<v-row v-for="(item, index) of data.form.detailList" :key="index" style="margin-top: 5px"><!-- <v-selectv-model="item.sku_id"@@ -99,6 +117,7 @@ import { checkDetailRepeatGetBool } from '@/utils/dataVerification/page'import skuSelect from '@/components/select/sku-select.vue'import { CommodityDetailJoinMainVO } from '@/types/Base/CommodityManagement'import { IsInteger } from '@/utils/dataVerification/formRule'+import customFilterSelect from '@/components/custom-filter-select.vue'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -109,7 +128,8 @@ const props = defineProps<{}>()const isShow = computed(() => props.showDialog)-+// eslint-disable-next-line vue/return-in-computed-property+const dialogWidth = computed(() => (data.form.detailList.length === 0 ? '30%' : '70%'))const data = reactive({curSelectType: '',showSkuDialogSelect: false,@@ -324,4 +344,8 @@ watch(// .v-col {// padding: 0 !important;// }+.v-card {+ margin: 0 auto;+ transition: width 0.3s;+}</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vueindex abedd7e..3d843cf 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue@@ -67,6 +67,7 @@<vxe-column field="location_name" :title="$t('wms.stock.location_name')"> </vxe-column><vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"> </vxe-column><vxe-column field="qty_available" :title="$t('wms.deliveryManagement.qty_available')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="pick_qty" :title="$t('wms.deliveryManagement.detailQty')" :edit-render="{}"><template #edit="{ row }"><vxe-input v-model="row.pick_qty" type="text"></vxe-input>@@ -93,6 +94,7 @@ import { getConfirmOrderInfoAndStock, confirmOrder } from '@/api/wms/deliveryManimport { hookComponent } from '@/components/system/index'import { isInteger } from '@/utils/dataVerification/tableRule'import CustomCheckbox from '@/components/custom-checkbox.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTable = ref()const detailXTable = ref()@@ -195,6 +197,15 @@ const method = reactive({// console.log(data.treeData)const { data: res } = await confirmOrder(data.treeData)if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage, false)) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.dataExpiration')+ })+ return+ }+hookComponent.$message({type: 'error',content: res.errorMessagediff --git a/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue b/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vueindex 0e030a6..e36e9b8 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue@@ -27,21 +27,21 @@<v-window-item value="tabPicked"><tabPicked ref="tabPickedRef" /></v-window-item>- <v-window-item value="tabToBePackaged">+ <!-- <v-window-item value="tabToBePackaged"><tabToBePackaged ref="tabToBePackagedRef" />- </v-window-item>+ </v-window-item> --><v-window-item value="tabPackaged"><tabPackaged ref="tabPackagedRef" /></v-window-item>- <v-window-item value="tabToBeWeighed">+ <!-- <v-window-item value="tabToBeWeighed"><tabToBeWeighed ref="tabToBeWeighedRef" />- </v-window-item>+ </v-window-item> --><v-window-item value="tabWeighed"><tabWeighed ref="tabWeighedRef" /></v-window-item>- <v-window-item value="tabToBeDelivered">+ <!-- <v-window-item value="tabToBeDelivered"><tabToBeDelivered ref="tabToBeDeliveredRef" />- </v-window-item>+ </v-window-item> --><v-window-item value="tabDelivered"><tabDelivered ref="tabDeliveredRef" /></v-window-item>@@ -63,11 +63,11 @@ import tabPreShipment from './tabPreShipment.vue'import tabNewShipment from './tabNewShipment.vue'import tabGoodsToBePicked from './tabGoodsToBePicked.vue'import tabPicked from './tabPicked.vue'-import tabToBePackaged from './tabToBePackaged.vue'+// import tabToBePackaged from './tabToBePackaged.vue'import tabPackaged from './tabPackaged.vue'-import tabToBeWeighed from './tabToBeWeighed.vue'+// import tabToBeWeighed from './tabToBeWeighed.vue'import tabWeighed from './tabWeighed.vue'-import tabToBeDelivered from './tabToBeDelivered.vue'+// import tabToBeDelivered from './tabToBeDelivered.vue'import tabDelivered from './tabDelivered.vue'import tabSignIn from './tabSignIn.vue'@@ -110,34 +110,37 @@ const tabsConfig = [icon: 'mdi-human-dolly',tabName: i18n.global.t('wms.deliveryManagement.picked')},- {- value: 'tabToBePackaged',- icon: 'mdi-package-variant',- tabName: i18n.global.t('wms.deliveryManagement.toBePackaged')- },+ // {+ // value: 'tabToBePackaged',+ // icon: 'mdi-package-variant',+ // tabName: i18n.global.t('wms.deliveryManagement.toBePackaged')+ // },{value: 'tabPackaged',- icon: 'mdi-package-variant-closed-check',+ icon: 'mdi-package-variant',+ // icon: 'mdi-package-variant-closed-check',tabName: i18n.global.t('wms.deliveryManagement.packaged')},- {- value: 'tabToBeWeighed',- icon: 'mdi-basket-fill',- tabName: i18n.global.t('wms.deliveryManagement.toBeWeighed')- },+ // {+ // value: 'tabToBeWeighed',+ // icon: 'mdi-basket-fill',+ // tabName: i18n.global.t('wms.deliveryManagement.toBeWeighed')+ // },{value: 'tabWeighed',- icon: 'mdi-weight',+ icon: 'mdi-basket-fill',+ // icon: 'mdi-weight',tabName: i18n.global.t('wms.deliveryManagement.weighed')},- {- value: 'tabToBeDelivered',- icon: 'mdi-send-outline',- tabName: i18n.global.t('wms.deliveryManagement.toBeDelivered')- },+ // {+ // value: 'tabToBeDelivered',+ // icon: 'mdi-send-outline',+ // tabName: i18n.global.t('wms.deliveryManagement.toBeDelivered')+ // },{value: 'tabDelivered',- icon: 'mdi-send',+ icon: 'mdi-send-outline',+ // icon: 'mdi-send',tabName: i18n.global.t('wms.deliveryManagement.outOfWarehouse')},{diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vueindex 841b4fe..386fed8 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vue@@ -1,5 +1,5 @@<template>- <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <v-dialog v-model="data.showDialog" :width="'70%'" transition="dialog-top-transition" :persistent="true"><template #default><v-card class="formCard"><v-toolbar color="white" :title="dialogTitle"></v-toolbar>@@ -46,7 +46,7 @@</template><script lang="ts" setup>-import { ref, reactive, computed, defineEmits, watch } from 'vue'+import { ref, reactive } from 'vue'import { hookComponent } from '@/components/system/index'import i18n from '@/languages/i18n'import { IsInteger, IsDecimal } from '@/utils/dataVerification/formRule'@@ -55,39 +55,50 @@ import { ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'const emit = defineEmits(['close', 'submit'])const props = defineProps<{- showDialog: boolean- dataList: ConfirmItem[]+ // showDialog: boolean+ // dataList: ConfirmItem[]isWeight: booleanisSignIn?: booleandialogTitle: string}>()-const isShow = computed(() => props.showDialog)+// const isShow = computed(() => props.showDialog)const data = reactive({+ showDialog: false as boolean,list: ref<ConfirmItem[]>([]),rules: {- qty: [- (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,- (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')- ],+ qty: [],weight: [(val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,(val: number) => IsDecimal(val, 'nonNegative', 15, 3) === '' || IsDecimal(val, 'nonNegative', 15, 3)]- }+ } as any})const method = reactive({+ openDialog: (dataList: ConfirmItem[] = []) => {+ data.list = dataList++ if (!props.isSignIn) {+ data.rules.qty = [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ]+ } else {+ data.rules.qty = []+ }++ data.showDialog = true+ },closeDialog: () => {- emit('close')+ // emit('close')+ data.showDialog = false},submit: () => {if (props.isSignIn) {const verificationFailedList = data.list.filter(- (item) => IsInteger(item.qty, 'nonNegative') !== ''- || Number(item.qty) < 0- || Number(item.qty) > item.maxQty+ (item) => IsInteger(item.qty, 'nonNegative') !== '' || Number(item.qty) < 0 || Number(item.qty) > item.maxQty)if (verificationFailedList.length > 0) {const errMsgStrList = verificationFailedList.map(@@ -99,11 +110,11 @@ const method = reactive({})} else {hookComponent.$dialog({- content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmSignIn') }?`,- handleConfirm: async () => {- emit('submit', data.list)- }- })+ content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmSignIn') }?`,+ handleConfirm: async () => {+ emit('submit', data.list)+ }+ })}} else {const verificationFailedList = data.list.filter(@@ -127,14 +138,19 @@ const method = reactive({}})-watch(- () => isShow.value,- (val) => {- if (val) {- data.list = props.dataList- }- }-)+// watch(+// () => isShow.value,+// (val) => {+// if (val) {+// data.list = props.dataList+// }+// }+// )++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})</script><style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/qrCodeDialog.vue b/frontend/src/view/deliveryManagement/deliveryManagement/qrCodeDialog.vuenew file mode 100644index 0000000..f864708--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/qrCodeDialog.vue@@ -0,0 +1,97 @@+<template>+ <v-dialog v-model="data.showDialog" width="248px" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-card-text>+ <div id="printArea" class="printArea">+ <div class="printTopContainer">+ <div class="printLabel" style="flex: 1">+ <div>+ <span class="labelTitle">{{ $t('wms.deliveryManagement.dispatch_no') }}:</span>{{ data.printData.dispatch_no }}+ </div>+ <vue-qr :key="data.printText" size="140" :margin="0" :auto-color="true" :dot-scale="1" :text="data.printText"></vue-qr>+ </div>+ </div>+ </div>+ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" variant="text">{{ $t('system.page.print') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script setup lang="tsx">+import { reactive } from 'vue'+import VueQr from 'vue-qr/src/packages/vue-qr.vue'++const data = reactive({+ showDialog: false,+ printData: {+ dispatch_no: ''+ } as any,+ printText: ''+})++const method = reactive({+ openDialog: (row: any) => {+ data.printData = row++ data.printText = JSON.stringify(data.printData)++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.printArea {+ width: 200px;++ display: flex;+ flex-wrap: wrap;+ align-items: center;+ justify-content: center;++ box-sizing: border-box;+ padding: 10px;++ .printTopContainer {+ display: flex;+ justify-content: space-between;+ }+}+.printLabel {+ font-size: 14px;+ font-weight: bold;++ display: flex;+ flex-wrap: wrap;+ align-items: center;+ justify-content: center;++ box-sizing: border-box;++ .labelTitle {+ opacity: 0.7;+ font-weight: 600;+ }++ div {+ width: 100%;+ text-align: center;+ margin-bottom: 5px;+ }+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vueindex 842a0dc..556baa9 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue@@ -19,9 +19,10 @@<vxe-column type="seq" width="60"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"></vxe-column><vxe-column field="warehouse_name" :title="$t('wms.stockLocation.warehouse_name')"></vxe-column><vxe-column field="warehouse_area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>@@ -39,7 +40,7 @@</template><script lang="ts" setup>-import { reactive, computed, defineEmits, watch } from 'vue'+import { reactive, computed, watch } from 'vue'import { hookComponent } from '@/components/system/index'import { viewInventoryDetails } from '@/api/wms/deliveryManagement'import i18n from '@/languages/i18n'diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-main-detail.vue b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-main-detail.vueindex d11e2a9..c1987b1 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-main-detail.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-main-detail.vue@@ -19,7 +19,7 @@<vxe-column type="seq" width="60"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="sku_name" :title="$t('wms.deliveryManagement.sku_name')"></vxe-column>@@ -36,7 +36,7 @@</template><script lang="ts" setup>-import { reactive, computed, defineEmits, watch } from 'vue'+import { reactive, computed, watch } from 'vue'import { hookComponent } from '@/components/system/index'import { viewDeliveryMainDetail } from '@/api/wms/deliveryManagement'import i18n from '@/languages/i18n'diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vuenew file mode 100644index 0000000..6d804bb--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vue@@ -0,0 +1,291 @@+<!-- supplier Setting -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <!-- <v-window v-model="data.activeTab">+ <v-window-item> -->+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="12" sm="4" class="col">+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" />+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="8">+ <v-row no-gutters>+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4"> </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table+ ref="xTable"+ :column-config="{+ minWidth: '100px'+ }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="dateFrom" :formatter="['formatDate', 'HH:mm:ss']" :title="$t('wms.deliveryBatchAllocation.dateFrom')"></vxe-column>+ <vxe-column field="dateTo" :formatter="['formatDate', 'HH:mm:ss']" :title="$t('wms.deliveryBatchAllocation.dateTo')"></vxe-column>+ <vxe-column field="allocationRule" :title="$t('wms.deliveryBatchAllocation.allocationRule')"></vxe-column>+ <vxe-column field="creator" :title="$t('base.supplier.creator')"></vxe-column>+ <vxe-column field="create_time" width="170px" :formatter="['formatDate', 'yyyy-MM-dd HH:mm']" :title="$t('base.supplier.create_time')">+ </vxe-column>+ <vxe-column+ field="last_update_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('base.supplier.last_update_time')"+ >+ </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('save')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="!data.authorityList.includes('delete') ? '' : errorColor"+ :disabled="!data.authorityList.includes('delete')"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <!-- </v-window-item>+ </v-window> -->+ </v-card-text>+ </v-card>+ </div>+ </div>+ <!-- <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" /> -->+</template>++<script lang="tsx" setup>+import { computed, ref, reactive, onMounted, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { SupplierVO } from '@/types/Base/Supplier'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import tooltipBtn from '@/components/tooltip-btn.vue'+// import addOrUpdateDialog from './add-or-update-supplier.vue'+import { hookComponent } from '@/components/system'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import { getSupplierList, deleteSupplier } from '@/api/base/supplier'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'++const xTable = ref()++const data = reactive({+ searchForm: {},+ tableData: [],+ // activeTab: null,+ showDialog: false,+ showDialogImport: false,+ dialogForm: {+ id: 0,+ dateFrom: '',+ dateTo: '',+ allocationRule: '',+ startAllocation: '',+ is_valid: true+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ },+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ authorityList: getMenuAuthorityList() as string[]+})++const method = reactive({+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getData()+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ dateFrom: '',+ dateTo: '',+ allocationRule: '',+ startAllocation: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Refresh data+ refresh: () => {+ method.getData()+ },+ editRow(row: SupplierVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: SupplierVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteSupplier(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.getData()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.supplier'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ getData: async () => {+ const { data: res } = await getSupplierList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ }+})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]++ method.getData()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vueindex 98eebff..c04d3ca 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue@@ -3,10 +3,12 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn><tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn><tooltip-btn icon="mdi-car-cog" :tooltip-text="$t('wms.deliveryManagement.setFreight')" @click="method.setFreight"> </tooltip-btn>- <tooltip-btn icon="mdi-email-check" :tooltip-text="$t('wms.deliveryManagement.signIn')" @click="method.handleSignIn"></tooltip-btn>+ <tooltip-btn icon="mdi-email-check" :tooltip-text="$t('wms.deliveryManagement.signIn')" @click="method.handleSignIn"></tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -66,9 +68,14 @@</template><vxe-column type="seq" width="60"></vxe-column><vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column :title="$t('wms.deliveryManagement.state')">+ <template #default="{ row }">+ <span>{{ `${row.is_todo ? $t('wms.deliveryManagement.deliveryTodo') : $t('wms.deliveryManagement.deliveryReady')}` }}</span>+ </template>+ </vxe-column><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -92,7 +99,12 @@<vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -124,12 +136,10 @@@submit="method.dialogSubmit"/> --><SignInConfirm+ ref="SignInConfirmRef":dialog-title="$t('wms.deliveryManagement.signIn')"- :show-dialog="data.showDialog":is-weight="false":is-sign-in="true"- :data-list="data.confirmList"- @close="method.dialogClose"@submit="method.dialogSubmit"/><SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />@@ -138,13 +148,13 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementDetailVO, SetCarrierVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'-import { getDelivery, handleSignIn, setCarrier } from '@/api/wms/deliveryManagement'+import { getDelivery, handleSignIn, setCarrier, handleDelivery } from '@/api/wms/deliveryManagement'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'// import ToBeSignInConfirm from './to-be-sign-in-confirm.vue'@@ -152,19 +162,21 @@ import SignInConfirm from './package-confirm.vue'import { GetUnit } from '@/constant/commodityManagement'import ToBeFreightfee from './to-be-freightfee.vue'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTable = ref()+const SignInConfirmRef = ref()const data = reactive({showDeliveredDetailID: 0,showDeliveredDetail: false,showSetFreight: false,- showDialog: false,dialogDefaultQty: 0,packageRow: ref<DeliveryManagementDetailVO>(),searchForm: {@@ -181,7 +193,10 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: []}),- confirmList: ref<ConfirmItem[]>([])+ confirmList: ref<ConfirmItem[]>([]),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -234,9 +249,6 @@ const method = reactive({method.freightfeeClose()method.refresh()},- dialogClose: () => {- data.showDialog = false- },// Callback after entering packaging valuedialogSubmit: async (list: ConfirmItem[]) => {const SingInList = list.map((item) => ({@@ -248,6 +260,15 @@ const method = reactive({const { data: res } = await handleSignIn(SingInList)if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ SignInConfirmRef.value.closeDialog()++ return+ }+hookComponent.$message({type: 'error',content: res.errorMessage@@ -258,7 +279,7 @@ const method = reactive({type: 'success',content: res.data})- method.dialogClose()+ SignInConfirmRef.value.closeDialog()method.refresh()// if (data.packageRow) {// const { data: res } = await handleSignIn([@@ -286,7 +307,9 @@ const method = reactive({},handleSignIn: async () => {const $table = xTable.value- const checkTableList = $table.getCheckboxRecords()+ let checkTableList = $table.getCheckboxRecords()++ checkTableList = checkTableList.filter((item: DeliveryManagementDetailVO) => !item.is_todo)const confirmList: ConfirmItem[] = []if (checkTableList.length > 0) {// Processing the data required by the window@@ -302,12 +325,11 @@ const method = reactive({dispatch_status: item.dispatch_status})}- data.confirmList = confirmList- data.showDialog = true+ SignInConfirmRef.value.openDialog(confirmList)} else {hookComponent.$message({type: 'error',- content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ content: `${ i18n.global.t('wms.deliveryManagement.opeartionCheckboxIsNull') }`})}// data.packageRow = row@@ -349,9 +371,89 @@ const method = reactive({sureSearch: () => {data.tablePage.searchObjects = setSearchObject(data.searchForm)method.getDelivery()+ },+ handleDeliver: async () => {+ const $table = xTable.value+ let checkTableList = $table.getCheckboxRecords()++ checkTableList = checkTableList.filter((item: DeliveryManagementDetailVO) => item.is_todo)++ if (checkTableList.length > 0) {+ const deliveredList = checkTableList.map((row: DeliveryManagementDetailVO) => ({+ id: row.id,+ dispatch_no: row.dispatch_no,+ dispatch_status: row.dispatch_status,+ picked_qty: row.picked_qty+ }))+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmDelivery') }?`,+ handleConfirm: async () => {+ const { data: res } = await handleDelivery(deliveredList)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.opeartionCheckboxIsNull') }`+ })+ }}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'delivered-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.deliveryManagement.delivery'),+ icon: 'mdi-cube-send',+ code: 'delivered-delivery',+ click: method.handleDeliver+ },+ {+ name: i18n.global.t('wms.deliveryManagement.setFreight'),+ icon: 'mdi-car-cog',+ code: 'delivered-setCarrier',+ click: method.setFreight+ },+ {+ name: i18n.global.t('wms.deliveryManagement.signIn'),+ icon: 'mdi-email-check',+ code: 'delivered-signIn',+ click: method.handleSignIn+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vueindex d1e312a..156f773 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -66,7 +68,7 @@<!-- <vxe-column type="checkbox" width="50"></vxe-column> --><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -85,7 +87,12 @@</vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -109,7 +116,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'@@ -120,11 +127,12 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -147,7 +155,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -196,6 +207,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'picked-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vueindex f5fa160..91726e7 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -101,7 +103,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'@@ -112,11 +114,12 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -136,7 +139,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -187,6 +193,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'invoice-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vueindex d4d6416..2b06dbc 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -58,15 +60,30 @@height: cardHeight}">- <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table+ ref="xTable"+ :checkbox-config="{+ checkMethod: method.getCheckBoxDisableState,+ visibleMethod: method.getCheckBoxDisableState+ }"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ ><template #empty>{{ i18n.global.t('system.page.noData') }}</template><vxe-column type="seq" width="60"></vxe-column>- <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column :title="$t('wms.deliveryManagement.state')">+ <template #default="{ row }">+ <span>{{ `${row.is_todo ? $t('wms.deliveryManagement.packageTodo') : $t('wms.deliveryManagement.packageReady')}` }}</span>+ </template>+ </vxe-column><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -84,10 +101,20 @@</template></vxe-column><vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>- <vxe-column field="package_time" width="170px" :title="$t('wms.deliveryManagement.package_time')"></vxe-column>+ <vxe-column+ field="package_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.package_time')"+ ></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -96,6 +123,7 @@:flat="true"icon="mdi-arrow-u-left-top":tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ :disabled="!data.authorityList.includes('packaged-revoke')"@click="method.backToThePreviousStep(row)"></tooltip-btn></div>@@ -113,28 +141,34 @@></custom-pager><SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />++ <PackageConfirm ref="PackageConfirmRef" :dialog-title="$t('wms.deliveryManagement.package')" :is-weight="false" @submit="method.dialogSubmit" /></div></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'-import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'-import { getPackaged, cancelOrderByDetail } from '@/api/wms/deliveryManagement'+import { getPackaged, cancelOrderByDetail, handlePackage } from '@/api/wms/deliveryManagement'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'+import PackageConfirm from './package-confirm.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTable = ref()+const PackageConfirmRef = ref()const data = reactive({showDeliveredDetailID: 0,@@ -155,7 +189,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -222,7 +259,93 @@ const method = reactive({sureSearch: () => {data.tablePage.searchObjects = setSearchObject(data.searchForm)method.getPackaged()- }+ },+ handlePackage: async () => {+ const $table = xTable.value+ const checkTableList = $table.getCheckboxRecords()+ const confirmList: ConfirmItem[] = []+ if (checkTableList.length > 0) {+ // Processing the data required by the window+ for (const item of checkTableList) {+ confirmList.push({+ id: item.id,+ spu_name: item.spu_name,+ spu_code: item.spu_code,+ sku_code: item.sku_code,+ maxQty: item.unpackage_qty,+ qty: item.unpackage_qty,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ picked_qty: item.picked_qty+ })+ }++ PackageConfirmRef.value.openDialog(confirmList)+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ // Callback after entering packaging value+ dialogSubmit: async (list: ConfirmItem[]) => {+ const packList = list.map((item) => ({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ package_qty: item.qty,+ picked_qty: item.picked_qty+ }))+ const { data: res } = await handlePackage(packList)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ PackageConfirmRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ PackageConfirmRef.value.closeDialog()+ method.refresh()+ },+ // Check if the checkbox can be checked+ getCheckBoxDisableState: ({ row }: { row: DeliveryManagementDetailVO }): boolean => row.is_todo+})++onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'packaged-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.deliveryManagement.package'),+ icon: 'mdi-package-down',+ code: 'packaged-package',+ click: method.handlePackage+ }+ ]})watch(diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vueindex 3d014df..f751735 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -66,7 +68,7 @@<!-- <vxe-column type="checkbox" width="50"></vxe-column> --><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -85,7 +87,12 @@</vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -109,7 +116,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'@@ -120,11 +127,12 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -147,7 +155,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -196,6 +207,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'picked-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vueindex bd8a2bd..16f804c 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -101,7 +103,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'@@ -112,11 +114,12 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -139,7 +142,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -190,6 +196,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'invoice-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vueindex 86ff145..1e6d806 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue@@ -3,9 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -65,8 +67,8 @@<template #empty>{{ i18n.global.t('system.page.noData') }}</template>+ <vxe-column type="checkbox" width="50" fixed="left"></vxe-column><vxe-column type="seq" width="60"></vxe-column>- <!-- <vxe-column type="checkbox" width="50"></vxe-column> --><vxe-column field="dispatch_no" width="120" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"><template #default="{ row }">@@ -86,38 +88,49 @@</vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <!-- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column> -->- <vxe-column field="operate" :title="$t('system.page.operate')" width="290" :resizable="false" show-overflow>+ <!-- <vxe-column+ field="create_time"+ width="120px"+ :formatter="['formatDate', 'yyyy-MM-dd']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column> -->+ <vxe-column field="operate" :title="$t('system.page.operate')" width="300px" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center"><tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn><tooltip-btn- :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"+ :disabled="!data.authorityList.includes('invoice-confirm') || (row.dispatch_status !== 0 && row.dispatch_status !== 1)":flat="true"icon="mdi-clipboard-check-outline":tooltip-text="$t('wms.deliveryManagement.confirmOrder')"@click="method.confirmOrder(row)"></tooltip-btn><tooltip-btn- :disabled="row.dispatch_status !== 2"+ :disabled="!data.authorityList.includes('picked-confirm') || row.dispatch_status !== 2":flat="true"icon="mdi-cart-arrow-down":tooltip-text="$t('wms.deliveryManagement.confirmPicking')"@click="method.confirmPicking(row)"></tooltip-btn><tooltip-btn- :disabled="row.dispatch_status !== 2 && row.dispatch_status !== 3"+ :disabled="+ (row.dispatch_status === 2 && !data.authorityList.includes('invoice-revoke')) ||+ (row.dispatch_status === 3 && !data.authorityList.includes('picked-revoke')) ||+ (row.dispatch_status !== 2 && row.dispatch_status !== 3)+ ":flat="true"icon="mdi-arrow-u-left-top":tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"@click="method.backToThePreviousStep(row)"></tooltip-btn><tooltip-btn- :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"+ :disabled="!data.authorityList.includes('invoice-delete') || (row.dispatch_status !== 0 && row.dispatch_status !== 1)":flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="+ !data.authorityList.includes('invoice-delete') || (row.dispatch_status !== 0 && row.dispatch_status !== 1) ? '' : errorColor+ "@click="method.deleteRow(row)"></tooltip-btn></div>@@ -149,11 +162,19 @@:show-dialog="data.showDeliveredMainDetail"@close="method.closeDeliveredDetail"/>++ <!-- Print QR code -->++ <qr-code-dialog ref="qrCodeDialogRef" :menu="'deliveryManagement-shipment'">+ <template #left="{ slotData }">+ <p>{{ $t('wms.deliveryManagement.dispatch_no') }}:{{ slotData.dispatch_no }}</p> + </template>+ </qr-code-dialog></div></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'@@ -167,13 +188,17 @@ import { getShipmentState } from './shipmentFun'import ConfirmOrder from './confirm-order.vue'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'+import BtnGroup from '@/components/system/btnGroup.vue'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTable = ref()+const qrCodeDialogRef = ref()const data = reactive({showDeliveredMainDetailNo: '',@@ -237,10 +262,40 @@ const data = reactive({value: '7'}]- }+ },+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList(),+ selectRowData: []})const method = reactive({+ // Print QR code+ printQrCode: () => {+ const records = xTable.value.getCheckboxRecords()++ // data.selectRowData.length === 0 ? data.selectRowData = [row] : ''+ // const records:any[] = data.selectRowData+ if (records.length > 0) {+ for (const item of records) {+ item.id = item.dispatch_no+ item.type = 'delivery'+ }+ qrCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ selectAllEvent({ checked }) {+ const records = xTable.value.getCheckboxRecords()+ checked ? (data.selectRowData = records) : (data.selectRowData = [])+ },+ selectChangeEvent() {+ data.selectRowData = xTable.value.getCheckboxRecords()+ },viewRow: (row: DeliveryManagementVO) => {if (row.dispatch_no) {data.showDeliveredMainDetailNo = row.dispatch_no@@ -258,6 +313,13 @@ const method = reactive({if (row.dispatch_no) {const { data: res } = await confirmPicking(row.dispatch_no)if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }+hookComponent.$message({type: 'error',content: res.errorMessage@@ -283,6 +345,13 @@ const method = reactive({dispatch_status: row.dispatch_status})if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }+hookComponent.$message({type: 'error',content: res.errorMessage@@ -348,6 +417,13 @@ const method = reactive({if (row.dispatch_no) {const { data: res } = await delShipment(row.dispatch_no)if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }+hookComponent.$message({type: 'error',content: res.errorMessage@@ -401,6 +477,35 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'invoice-save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'invoice-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('base.commodityManagement.printQrCode'),+ icon: 'mdi-qrcode',+ code: 'invoice-printQrCode',+ click: method.printQrCode+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vueindex f82c80e..1509ce1 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -65,7 +67,7 @@<vxe-column type="seq" width="60"></vxe-column><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -98,7 +100,12 @@<vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -122,7 +129,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import XEUtils from 'xe-utils'import { computedCardHeight, computedTableHeight } from '@/constant/style'@@ -134,11 +141,12 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -161,7 +169,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -210,6 +221,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'signedIn-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vueindex 605440e..253276a 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vue@@ -3,9 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn><tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>- <tooltip-btn icon="mdi-cube-send" :tooltip-text="$t('wms.deliveryManagement.delivery')" @click="method.handleDeliver"> </tooltip-btn>+ <tooltip-btn icon="mdi-cube-send" :tooltip-text="$t('wms.deliveryManagement.delivery')" @click="method.handleDeliver"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -67,7 +69,7 @@<vxe-column type="checkbox" width="50"></vxe-column><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -121,7 +123,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'@@ -132,11 +134,12 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -159,7 +162,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -175,11 +181,11 @@ const method = reactive({const checkTableList = $table.getCheckboxRecords()if (checkTableList.length > 0) {const deliveredList = checkTableList.map((row: DeliveryManagementDetailVO) => ({- id: row.id,- dispatch_no: row.dispatch_no,- dispatch_status: row.dispatch_status,- picked_qty: row.picked_qty- }))+ id: row.id,+ dispatch_no: row.dispatch_no,+ dispatch_status: row.dispatch_status,+ picked_qty: row.picked_qty+ }))hookComponent.$dialog({content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmDelivery') }?`,handleConfirm: async () => {@@ -243,6 +249,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'delivered-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.deliveryManagement.delivery'),+ icon: 'mdi-cube-send',+ code: 'delivered-delivery',+ click: method.handleDeliver+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vueindex c671a2b..34f1f89 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vue@@ -3,9 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn><tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>- <tooltip-btn icon="mdi-package-down" :tooltip-text="$t('wms.deliveryManagement.package')" @click="method.handlePackage"> </tooltip-btn>+ <tooltip-btn icon="mdi-package-down" :tooltip-text="$t('wms.deliveryManagement.package')" @click="method.handlePackage"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -67,7 +69,7 @@<vxe-column type="checkbox" width="50"></vxe-column><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -127,7 +129,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'@@ -140,11 +142,12 @@ import i18n from '@/languages/i18n'import PackageConfirm from './package-confirm.vue'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -171,7 +174,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -280,6 +286,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'packaged-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.deliveryManagement.package'),+ icon: 'mdi-package-down',+ code: 'packaged-package',+ click: method.handlePackage+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vueindex 88eed39..703c693 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vue@@ -3,9 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn><tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>- <tooltip-btn icon="mdi-weight" :tooltip-text="$t('wms.deliveryManagement.weigh')" @click="method.handleWeigh"> </tooltip-btn>+ <tooltip-btn icon="mdi-weight" :tooltip-text="$t('wms.deliveryManagement.weigh')" @click="method.handleWeigh"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -68,7 +70,7 @@<!-- <vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column> --><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -139,7 +141,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'@@ -150,12 +152,13 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'import WeightConfirm from './package-confirm.vue'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -181,7 +184,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -295,6 +301,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'weighed-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.deliveryManagement.weigh'),+ icon: 'mdi-weight',+ code: 'weighed-weigh',+ click: method.handleWeigh+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vueindex ea8a5f8..8edd48b 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -58,15 +60,31 @@height: cardHeight}">- <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :checkbox-config="{+ checkMethod: method.getCheckBoxDisableState,+ visibleMethod: method.getCheckBoxDisableState+ }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ ><template #empty>{{ i18n.global.t('system.page.noData') }}</template><vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column :title="$t('wms.deliveryManagement.state')">+ <template #default="{ row }">+ <span>{{ `${row.is_todo ? $t('wms.deliveryManagement.weighTodo') : $t('wms.deliveryManagement.weighReady')}` }}</span>+ </template>+ </vxe-column><vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column><vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column><vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"></vxe-column>- <vxe-column field="spu_description" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column>+ <vxe-column field="spu_description" width="200px" :title="$t('wms.deliveryManagement.spu_description')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')"></vxe-column><vxe-column field="bar_code" :title="$t('wms.deliveryManagement.bar_code')"></vxe-column>@@ -91,7 +109,12 @@</vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.deliveryManagement.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -100,6 +123,7 @@:flat="true"icon="mdi-arrow-u-left-top":tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ :disabled="!data.authorityList.includes('weighed-revoke')"@click="method.backToThePreviousStep(row)"></tooltip-btn></div>@@ -117,28 +141,33 @@></custom-pager><SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <WeightConfirm ref="WeightConfirmRef" :dialog-title="$t('wms.deliveryManagement.weigh')" :is-weight="true" @submit="method.dialogSubmit" /></div></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'-import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'-import { getWeighed, cancelOrderByDetail } from '@/api/wms/deliveryManagement'+import { getWeighed, cancelOrderByDetail, handleWeigh } from '@/api/wms/deliveryManagement'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import { GetUnit } from '@/constant/commodityManagement'import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { TablePage, btnGroupItem } from '@/types/System/Form'import SearchDeliveredDetail from './search-delivered-detail.vue'import { exportData } from '@/utils/exportTable'import { DEBOUNCE_TIME } from '@/constant/system'+import BtnGroup from '@/components/system/btnGroup.vue'+import WeightConfirm from './package-confirm.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTable = ref()+const WeightConfirmRef = ref()const data = reactive({showDeliveredDetailID: 0,@@ -160,7 +189,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: []- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -227,7 +259,107 @@ const method = reactive({sureSearch: () => {data.tablePage.searchObjects = setSearchObject(data.searchForm)method.getWeighed()- }+ },+ handleWeigh: async () => {+ const $table = xTable.value+ const checkTableList = $table.getCheckboxRecords()+ const confirmList: ConfirmItem[] = []+ if (checkTableList.length > 0) {+ // Processing the data required by the window+ for (const item of checkTableList) {+ confirmList.push({+ id: item.id,+ spu_name: item.spu_name,+ spu_code: item.spu_code,+ sku_code: item.sku_code,+ maxQty: item.unweighing_qty,+ qty: item.unweighing_qty,+ weight: item.weight,+ weight_unit: GetUnit('weight', item.weight_unit),+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ picked_qty: item.picked_qty+ })+ }+ // data.confirmList = confirmList+ // data.showDialog = true++ WeightConfirmRef.value.openDialog(confirmList)+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ // data.weighedRow = row+ // data.dialogWeightUnit = row.weight_unit !== undefined ? GetUnit('weight', row.weight_unit) : ''+ // data.dialogMaxQty = row.unweighing_qty ? row.unweighing_qty : 0+ // data.defaultWeight = row.weight ? row.weight : 0+ // data.showDialog = true+ },+ // Callback after entering packaging value+ dialogSubmit: async (list: ConfirmItem[]) => {+ const packList = list.map((item) => ({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ weighing_qty: item.qty,+ weighing_weight: item.weight,+ picked_qty: item.picked_qty+ }))+ // if (data.weighedRow) {+ const { data: res } = await handleWeigh(packList)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ WeightConfirmRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ // method.dialogClose()+ WeightConfirmRef.value.closeDialog()++ method.refresh()+ // }+ },+ // Check if the checkbox can be checked+ getCheckBoxDisableState: ({ row }: { row: DeliveryManagementDetailVO }): boolean => row.is_todo+})++onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'weighed-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.deliveryManagement.weigh'),+ icon: 'mdi-weight',+ code: 'weighed-weigh',+ click: method.handleWeigh+ }+ ]})const cardHeight = computed(() => computedCardHeight({}))diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vueindex 0ddeb00..2044734 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vue@@ -46,7 +46,7 @@</template><script lang="ts" setup>-import { reactive, computed, defineEmits, watch } from 'vue'+import { reactive, computed, watch } from 'vue'import { hookComponent } from '@/components/system/index'import i18n from '@/languages/i18n'import freightSelect from '@/components/select/freight-select.vue'diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vueindex 1edcdc9..a1df62f 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue@@ -24,7 +24,7 @@</template><script lang="ts" setup>-import { reactive, computed, defineEmits, watch } from 'vue'+import { reactive, computed, watch } from 'vue'import { hookComponent } from '@/components/system/index'import i18n from '@/languages/i18n'import { IsInteger } from '@/utils/dataVerification/formRule'diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vueindex 585c0dd..b511f75 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vue@@ -24,7 +24,7 @@</template><script lang="ts" setup>-import { reactive, computed, defineEmits, watch } from 'vue'+import { reactive, computed, watch } from 'vue'import { hookComponent } from '@/components/system/index'import i18n from '@/languages/i18n'import { IsInteger } from '@/utils/dataVerification/formRule'diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vueindex fd716d0..cacd389 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue@@ -32,7 +32,7 @@</template><script lang="ts" setup>-import { reactive, computed, defineEmits, watch } from 'vue'+import { reactive, computed, watch } from 'vue'import { hookComponent } from '@/components/system/index'import i18n from '@/languages/i18n'import { IsInteger, IsDecimal } from '@/utils/dataVerification/formRule'diff --git a/frontend/src/view/home/homeHeader.vue b/frontend/src/view/home/homeHeader.vueindex e102e5d..1e9e2a0 100644--- a/frontend/src/view/home/homeHeader.vue+++ b/frontend/src/view/home/homeHeader.vue@@ -14,6 +14,9 @@<div class="gitSrc mr-4"><img src="@/assets/img/github.png" alt="Gitee" @click="method.toGit('github')" /></div>+ <div class="gitSrc mr-4">+ <img src="@/assets/img/apifox.png" alt="API" @click="method.toGit('apifox')" />+ </div><LanguagesSwitch /><v-menu><template #activator="{ props }">@@ -24,12 +27,14 @@</template><v-list><v-list-item v-for="(item, index) in data.userOperationMenu" :key="index" :value="index" @click="method.operation(item.value)">- <v-list-item-title>{{ item.title }}</v-list-item-title>+ <v-list-item-title :title="item.title">{{ item.title }}</v-list-item-title></v-list-item></v-list></v-menu></div><ChangePwd ref="ChangePwdRef" />++ <ViewLogDialog ref="ViewLogDialogRef" /></div></template>@@ -43,9 +48,11 @@ import { router } from '@/router'import { store } from '@/store'import { DataProps } from '@/types/Home/HomeHeader'import ChangePwd from '@/components/system/change-pwd.vue'+import ViewLogDialog from '@/components/system/view-log-dialog.vue'const routerInfo = useRouter()const ChangePwdRef = ref()+const ViewLogDialogRef = ref()const data: DataProps = reactive({breadcrumbItems: [],@@ -55,6 +62,10 @@ const data: DataProps = reactive({title: i18n.global.t('system.homeHeader.changePwd'),value: 'changePwd'},+ {+ title: i18n.global.t('system.homeHeader.log'),+ value: 'viewLog'+ },{title: i18n.global.t('system.homeHeader.logout'),value: 'logout'@@ -96,6 +107,8 @@ const method = reactive({router.push('/login')} else if (value === 'changePwd') {ChangePwdRef.value.open()+ } else if (value === 'viewLog') {+ ViewLogDialogRef.value.openDialog()}},toGit: (type: string) => {@@ -103,6 +116,8 @@ const method = reactive({window.open('https://gitee.com/modernwms/ModernWMS', '_blank')} else if (type === 'github') {window.open('https://github.com/fjykTec/ModernWMS', '_blank')+ } else if (type === 'apifox') {+ window.open('https://apifox.com/apidoc/shared-c34f3f10-1982-4d24-8214-a8c2490fd02e', '_blank')}}})diff --git a/frontend/src/view/home/homeSideBar.vue b/frontend/src/view/home/homeSideBar.vueindex eed264e..4864812 100644--- a/frontend/src/view/home/homeSideBar.vue+++ b/frontend/src/view/home/homeSideBar.vue@@ -4,7 +4,6 @@<div class="sideBarTitle"><Logo :height="50" :top="15" :left="5" /></div>- <!-- 测试数据 --><div class="sideBarMenus"><div v-for="(item, index) in data.menuList" :key="index"><div class="menuItems" :class="method.getItemClass(item)" @click="method.openMenu(item)">diff --git a/frontend/src/view/home/homepage/homepage.vue b/frontend/src/view/home/homepage/homepage.vueindex b12fdf1..13b4049 100644--- a/frontend/src/view/home/homepage/homepage.vue+++ b/frontend/src/view/home/homepage/homepage.vue@@ -27,6 +27,14 @@ import i18n from '@/languages/i18n'position: relative;align-items: center;}+.VWMS{+ position: absolute;+ top: 0;+ display: flex;+ align-items: center;+ width: 40%;+ z-index: 999999999;+}.content {width: 60%;diff --git a/frontend/src/view/login/login.vue b/frontend/src/view/login/login.vueindex e923faa..cca8604 100644--- a/frontend/src/view/login/login.vue+++ b/frontend/src/view/login/login.vue@@ -23,7 +23,7 @@ import { reactive, onMounted } from 'vue'import LoginForm from '@/components/login/login-form.vue'import LanguagesSwitch from '@/components/system/languages.vue'import Logo from '@/components/system/logo.vue'-import { emitter } from '@/utils/bus.js'+import { emitter } from '@/utils/bus'const method = reactive({toICP: () => {@@ -31,7 +31,7 @@ const method = reactive({}})-// 回到登录界面清除状态+// Return to the login interface to clear the statusonMounted(() => {emitter.emit('closeLoading')})@@ -48,6 +48,7 @@ onMounted(() => {height: 100%;display: flex;background-color: #fff;+ // position: relative;.loginLeft {width: 70%;display: flex;diff --git a/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vue b/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vuenew file mode 100644index 0000000..3eee8c6--- /dev/null+++ b/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vue@@ -0,0 +1,333 @@+<!-- Warehouse Freeze -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <BtnGroup :authority-list="data.authorityList" :btn-list="btnList" />+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <search-group+ ref="searchGroupRef"+ v-model="data.searchForm"+ :menu-name="data.menu_name"+ i18n-prefix="wms.stockAsnInfo"+ @sure-search="method.sureSearch"+ />+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ v-if="data.currentRender === 'table'"+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table+ ref="xTableStockLocation"+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="tableHeight"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>+ <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>+ <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>+ <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>+ <vxe-column field="actual_qty" :title="$t('wms.stockAsnInfo.actual_qty')"></vxe-column>+ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>+ <vxe-column field="shortage_qty" :title="$t('wms.stockAsnInfo.shortage_qty')"></vxe-column>+ <vxe-column field="more_qty" :title="$t('wms.stockAsnInfo.more_qty')"></vxe-column>+ <vxe-column field="damage_qty" :title="$t('wms.stockAsnInfo.damage_qty')"></vxe-column>+ <!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column> -->+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <div+ v-else+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <Chart type="asn" :chart-data="data.tableData" />+ </div>++ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>++ <view-detail-dialog ref="ViewDetailDialogRef" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch, onMounted } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { DEBOUNCE_TIME } from '@/constant/system'+import { getMenuAuthorityList, setSearchObject } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { hookComponent } from '@/components/system'+import skuInfo from '@/view/wms/stockAsn/sku-info.vue'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { getStockAsnList } from '@/api/wms/stockAsn'+import ViewDetailDialog from '@/view/wms/stockAsn/view-detail-dialog.vue'+import SearchGroup from '@/components/system/search-group.vue'+import Chart from '../components/Chart.vue'++const xTableStockLocation = ref()+const ViewDetailDialogRef = ref()+const searchGroupRef = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ goods_owner_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ dialogForm: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:4',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList(),+ // Local search criteria settings+ menu_name: 'asnStatistic',+ currentRender: 'table'+})++const method = reactive({+ // Switch Chart Mode+ switchRenderMode: () => {+ if (data.currentRender === 'chart') {+ data.currentRender = 'table'+ } else {+ data.currentRender = 'chart'+ }+ },+ // Set Search+ handleSetSearch: () => {+ searchGroupRef.value.openDialog()+ },+ // View Rows+ // viewRow: (row: StockAsnVO) => {+ // ViewDetailDialogRef.value.openDialog(row.id)+ // },+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ // Refresh data+ refresh: () => {+ method.getStockAsnList()+ },+ getStockAsnList: async () => {+ const { data: res } = await getStockAsnList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getStockAsnList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabReceiptDetails'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++onMounted(() => {+ // data.btnList = [+ // {+ // name: i18n.global.t('system.page.refresh'),+ // icon: 'mdi-refresh',+ // code: '',+ // click: method.refresh+ // },+ // {+ // name: i18n.global.t('system.page.export'),+ // icon: 'mdi-export-variant',+ // code: 'export',+ // click: method.exportTable+ // },+ // {+ // name: i18n.global.t('system.page.setSearch'),+ // icon: 'mdi-cog',+ // code: '',+ // click: method.handleSetSearch+ // },+ // {+ // name: i18n.global.t('system.page.chart'),+ // icon: 'mdi-chart-bar',+ // code: '',+ // click: method.switchRenderMode+ // }+ // ]+ // method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))+const btnList = computed(() => [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('system.page.setSearch'),+ icon: 'mdi-cog',+ code: '',+ click: method.handleSetSearch+ },+ {+ name: data.currentRender !== 'chart' ? i18n.global.t('system.page.chart') : i18n.global.t('system.page.table'),+ icon: data.currentRender !== 'chart' ? 'mdi-chart-bar' : 'mdi-table',+ code: '',+ click: method.switchRenderMode+ }+])++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/statisticAnalysis/components/Chart.vue b/frontend/src/view/statisticAnalysis/components/Chart.vuenew file mode 100644index 0000000..ae04225--- /dev/null+++ b/frontend/src/view/statisticAnalysis/components/Chart.vue@@ -0,0 +1,187 @@+<!--+ @name : Chart.vue+ @Description :+ @author : linxingmin+ @date : 2023/10/26+-->+<template>+ <div class="chat-container">+ <v-select+ v-model="selectType"+ :items="selectList"+ :label="$t('base.printSolution.vue_path')"+ class="select"+ item-title="label"+ item-value="value"+ variant="outlined"+ >+ </v-select>+ <div ref="chatRef" class="chat" />+ </div>+</template>++<script lang="ts" setup>+import { onMounted, ref, watch } from 'vue'+import * as echarts from 'echarts'+import { EChartsOption, EChartsType } from 'echarts'+import _ from 'lodash'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import { DeliveryStatisticVo } from '@/types/WMS/DeliveryStatistic'+import i18n from '@/languages/i18n'++const props = defineProps<{+ chartData: StockAsnVO[] | DeliveryStatisticVo[],+ type: string+}>()++onMounted(() => {+ handleSelectChange()+ initCharts()+})+const selectList = [{+ label: i18n.global.t('wms.deliveryStatistic.goods_owner_name'),+ value: 'goodsOwnerName'+},+ {+ label: i18n.global.t('wms.deliveryStatistic.category_name'),+ value: 'categoryName'+ }]+const chatRef = ref()+const selectType = ref('goodsOwnerName')++let chat: EChartsType+const initCharts = () => {+ if (chat) chat.dispose()+ chat = echarts.init(chatRef.value)+ // chat.on('legendselectchanged', (params:any) => {+ // const legendName = params.name+ // const yAxisName = legendName === '数量' ? '数量' : '金额(元)'+ // chat.setOption({+ // yAxis: {+ // name: yAxisName+ // }+ // })+ // })+ const option: EChartsOption = {+ tooltip: {+ trigger: 'axis',+ axisPointer: {+ type: 'shadow',+ label: {+ show: true+ }+ }+ },+ toolbox: {+ show: true,+ feature: {+ mark: { show: true },+ dataView: {+ show: true,+ readOnly: false+ },+ magicType: {+ show: true,+ type: ['line', 'bar']+ },+ restore: { show: true },+ saveAsImage: { show: true }+ }+ },+ calculable: true,+ legend: {+ data: [i18n.global.t('wms.deliveryStatistic.amount'), i18n.global.t('wms.deliveryStatistic.amount_money')],+ itemGap: 5,+ selectedMode: 'single'+ },+ xAxis: [+ {+ type: 'category',+ data: xAxisData.value+ }+ ],+ yAxis: [+ {+ type: 'value',+ // name: '数量',+ axisLabel: {+ formatter(a) {+ return a.toLocaleString()+ }+ }+ }+ ],+ dataZoom: [+ {+ show: true,+ start: 0,+ end: 100+ }+ ],+ series: [+ {+ name: i18n.global.t('wms.deliveryStatistic.amount'),+ type: 'bar',+ data: sumAmountData.value+ },+ {+ name: i18n.global.t('wms.deliveryStatistic.amount_money'),+ type: 'bar',+ data: sumAmountMoneyData.value+ }+ ]+ }+ chat.setOption(option)+}++const xAxisData = ref<string[]>([])+const sumAmountData = ref<number[]>([])+const sumAmountMoneyData = ref<number[]>([])+const handleSelectChange = () => {+ xAxisData.value = []+ sumAmountData.value = []+ sumAmountMoneyData.value = []+ if (props.type === 'delivery') {+ const filterCondition = selectType.value === 'goodsOwnerName' ? 'goods_owner_name' : 'sku_name'+ const groupedData = _.groupBy(props.chartData, filterCondition)+ _.forEach(groupedData, (group, key) => {+ const sumAmount = _.sumBy(group, 'delivery_qty')+ const sumAmountMoney = _.sumBy(group, 'delivery_amount')+ xAxisData.value.push(key)+ sumAmountData.value.push(sumAmount)+ sumAmountMoneyData.value.push(sumAmountMoney)+ })+ } else {+ const filterCondition = selectType.value === 'goodsOwnerName' ? 'goods_owner_name' : 'sku_name'+ const groupedData = _.groupBy(props.chartData, filterCondition)+ _.forEach(groupedData, (group, key) => {+ const sumAmount = _.sumBy(group, 'actual_qty')+ xAxisData.value.push(key)+ sumAmountData.value.push(sumAmount)+ sumAmountMoneyData.value = []+ })+ }+ initCharts()+}+watch(selectType, handleSelectChange)+watch(() => props.chartData, handleSelectChange)++</script>++<style lang="less" scoped>+.chat-container {+ width: 100%;+ height: 100%;+ display: grid;+ grid-template-rows: 60px 1fr;++ .select {+ width: 240px;+ }+}++.chat {+ width: 100%;+ height: 100%;+}+</style>\ No newline at end of filediff --git a/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vue b/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vuenew file mode 100644index 0000000..aa3ac59--- /dev/null+++ b/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vue@@ -0,0 +1,295 @@+<!-- Warehouse Freeze -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <BtnGroup :authority-list="data.authorityList" :btn-list="btnList" />+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <search-group+ ref="searchGroupRef"+ v-model="data.searchForm"+ :menu-name="data.menu_name"+ i18n-prefix="wms.deliveryStatistic"+ @sure-search="method.sureSearch"+ />+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ v-if="data.currentRender === 'table'"+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '120px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryStatistic.dispatch_no')"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.deliveryStatistic.warehouse_name')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.deliveryStatistic.location_name')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryStatistic.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryStatistic.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryStatistic.sku_code')"></vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.deliveryStatistic.sku_name')"></vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryStatistic.customer_name')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.deliveryStatistic.series_number')"></vxe-column>+ <vxe-column field="delivery_qty" :title="$t('wms.deliveryStatistic.delivery_qty')"></vxe-column>+ <vxe-column+ field="delivery_date"+ :title="$t('wms.deliveryStatistic.delivery_date')"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ ></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>++ <div+ v-else+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <Chart type="delivery" :chart-data="data.tableData" />+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch, onMounted } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { DEBOUNCE_TIME } from '@/constant/system'+import { getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { list as getDeliveryStatisticList } from '@/api/wms/deliveryStatistic'+import { hookComponent } from '@/components/system'+import { DeliveryStatisticVo } from '@/types/WMS/DeliveryStatistic'+import SearchGroup from '@/components/system/search-group.vue'+import Chart from '../components/Chart.vue'++const xTable = ref()+const searchGroupRef = ref()++const data = reactive({+ showDialog: false,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ warehouse_name: '',+ customer_name: '',+ delivery_date_from: '',+ delivery_date_to: ''+ },+ tableData: ref<DeliveryStatisticVo[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList(),+ // Local search criteria settings+ menu_name: 'deliveryStatistic',+ currentRender: 'table'+})++const method = reactive({+ // Switch Chart Mode+ switchRenderMode: () => {+ if (data.currentRender === 'chart') {+ data.currentRender = 'table'+ } else {+ data.currentRender = 'chart'+ }+ },+ // get data+ list: async () => {+ const searchForm = {}++ for (const item of Object.keys(data.searchForm)) {+ if (data.searchForm[item]) {+ searchForm[item] = data.searchForm[item]+ }+ }++ const { data: res } = await getDeliveryStatisticList({ ...data.tablePage, ...searchForm })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ // Refresh data+ refresh: () => {+ method.list()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ // Pagination function+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ // Export Table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.deliveryStatistic'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ // data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // Set Search+ handleSetSearch: () => {+ searchGroupRef.value.openDialog()+ }+})++onMounted(() => {+ // data.btnList = [+ // {+ // name: i18n.global.t('system.page.refresh'),+ // icon: 'mdi-refresh',+ // code: '',+ // click: method.refresh+ // },+ // {+ // name: i18n.global.t('system.page.export'),+ // icon: 'mdi-export-variant',+ // code: 'export',+ // click: method.exportTable+ // },+ // {+ // name: i18n.global.t('system.page.setSearch'),+ // icon: 'mdi-cog',+ // code: '',+ // click: method.handleSetSearch+ // }+ // ]+ // method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))+const btnList = computed(() => [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('system.page.setSearch'),+ icon: 'mdi-cog',+ code: '',+ click: method.handleSetSearch+ },+ {+ name: data.currentRender !== 'chart' ? i18n.global.t('system.page.chart') : i18n.global.t('system.page.table'),+ icon: data.currentRender !== 'chart' ? 'mdi-chart-bar' : 'mdi-table',+ code: '',+ click: method.switchRenderMode+ }+])++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/statisticAnalysis/saftyStock/saftyStock.vue b/frontend/src/view/statisticAnalysis/saftyStock/saftyStock.vuenew file mode 100644index 0000000..a3866db--- /dev/null+++ b/frontend/src/view/statisticAnalysis/saftyStock/saftyStock.vue@@ -0,0 +1,225 @@+<!-- Warehouse Freeze -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" />+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockList.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '120px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.saftyStock.warehouse_name')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.saftyStock.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.saftyStock.spu_name')"></vxe-column>+ <vxe-column field="sku_id" :title="$t('wms.saftyStock.sku_id')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.saftyStock.sku_code')"></vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.saftyStock.sku_name')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.saftyStock.qty')"></vxe-column>+ <vxe-column field="qty_available" :title="$t('wms.saftyStock.qty_available')"></vxe-column>+ <vxe-column field="qty_locked" :title="$t('wms.saftyStock.qty_locked')"></vxe-column>+ <vxe-column field="qty_frozen" :title="$t('wms.saftyStock.qty_frozen')"></vxe-column>+ <vxe-column field="safety_stock_qty" :title="$t('wms.saftyStock.safety_stock_qty')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch, onMounted } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { FREEZE_JOB_FREEZE } from '@/constant/warehouseWorking'+import { DEBOUNCE_TIME } from '@/constant/system'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { list as getSafetyStockList } from '@/api/wms/saftyStock'+import { hookComponent } from '@/components/system'+import { SafetyStockVo } from '@/types/WMS/SafetyStock'++const xTable = ref()++const data = reactive({+ showDialog: false,+ freezeType: FREEZE_JOB_FREEZE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ spu_name: ''+ },+ tableData: ref<SafetyStockVo[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()+})++const method = reactive({+ // get data+ list: async () => {+ const { data: res } = await getSafetyStockList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ // Refresh data+ refresh: () => {+ method.list()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ // Pagination function+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ // Export Table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.saftyStock'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ }+})++onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]++ method.refresh()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/vwms/Detail.vue b/frontend/src/view/vwms/Detail.vuenew file mode 100644index 0000000..1b12c82--- /dev/null+++ b/frontend/src/view/vwms/Detail.vue@@ -0,0 +1,185 @@+<!--+ @name : Detail.vue+ @Description :+ @author : saal+ @date : 2023/10/9+-->+<template>+ <div class="warehouse-info VWms-card">+ <Transition name="slide-fade">+ <div v-if="props.presentData?.type === 'warehouse'">+ <div class="header">+ <p class="main-title">{{ props.presentData?.warehouse_name }}</p>+ <p class="sub-title">{{ props.presentData?.address }}</p>+ </div>+ <div class="text-grid">+ <p>负责人:</p>+ <p>{{ props.presentData?.manager }}</p>+ <p>联系电话:</p>+ <p>{{ props.presentData?.contact_tel }}</p>+ <p>Email:</p>+ <p>{{ props.presentData?.email }}</p>+ </div>+ <v-divider></v-divider>+ <div class="data-grid">+ <div class="column-center data-container">+ <p class="data-label">库区数</p>+ <p class="data-number">{{ props.presentData?.factory_number }}</p>+ </div>+ <div class="column-center data-container">+ <p class="data-label">库存量</p>+ <p class="data-number">{{ props.presentData?.warehouse_product_number }}</p>+ </div>+ </div>+ </div>+ </Transition>+ <Transition name="slide-fade">+ <div v-show="props.presentData?.type === 'factory'">+ <div class="header">+ <p class="main-title">{{ props.presentData?.area_name }}</p>+ <p class="sub-title">{{ formatAreaProperty(props.presentData?.area_property) }}</p>+ </div>+ <v-divider></v-divider>+ <div class="data-grid">+ <div class="column-center data-container">+ <p class="data-label">总货架数</p>+ <p class="data-number">{{ props.presentData?.shelf_number }}</p>+ </div>+ <div class="column-center data-container">+ <p class="data-label">总库位数</p>+ <p class="data-number">{{ props.presentData?.shelf_item_number }}</p>+ </div>+ <div class="column-center data-container">+ <p class="data-label">剩余库位</p>+ <p class="data-number">{{ props.presentData?.surplus_number }}</p>+ </div>+ <div class="column-center data-container">+ <p class="data-label">总货物数</p>+ <p class="data-number">{{ props.presentData?.factory_product_number }}</p>+ </div>+ </div>+ </div>+ </Transition>+ <Transition name="slide-fade">+ <div v-show="props.presentData?.type === 'shelf'">+ <div class="flex-center-between">+ <div class="header">+ <p class="main-title">{{ props.presentData?.shelf_name }}</p>+ </div>+ <p><span class="em">货架规格: </span>{{ props.presentData?.layer }} * {{ props.presentData?.column }}</p>+ </div>+ <v-divider></v-divider>+ <div class="data-grid">+ <div class="column-center data-container">+ <p class="data-label">闲置库位</p>+ <p class="data-number">{{ props.presentData?.surplus_number }}</p>+ </div>+ <div class="column-center data-container">+ <p class="data-label">总货物数</p>+ <p class="data-number">{{ props.presentData?.shelf_product_number }}</p>+ </div>+ </div>+ </div>+ </Transition>+ <Transition name="slide-fade">+ <div v-show="props.presentData?.type === 'shelfItem'">+ <div class="header">+ <p class="main-title">{{ props.presentData?.tag_number }}号库位</p>+ </div>+ <div class="text-grid">+ <p>层号:</p>+ <p>{{ props.presentData?.layer_number }}</p>+ <p>货架编码:</p>+ <p>{{ props.presentData?.location_name }}</p>+ </div>+ <v-divider></v-divider>+ <div>+ <div v-if="props.presentData?.product?.length === 0">空库位</div>+ <div v-else class="product-info-container">+ <vxe-table+ align="center"+ :data="props.presentData?.product"+ border+ height="160"+ :row-config="{isHover: true}"+ >+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="spu_name" title="货物名称"></vxe-column>+ <vxe-column field="sku_name" title="规格名称"></vxe-column>+ <vxe-column field="qty" title="数量"></vxe-column>+ </vxe-table>+ </div>+ </div>+ </div>+ </Transition>+ </div>+</template>++<script setup lang="ts">+import { formatAreaProperty } from '@/utils/format/formatWarehouse'++const props = defineProps(['presentData'])+</script>++<style scoped lang="less">+.column-center {+ display: flex;+ flex-direction: column;+ align-items: center;++}+.warehouse-info {+ height: 300px;+ .header {+ .main-title {+ font-weight: 700;+ font-size: 18px;+ margin-bottom: 5px;+ }+ .sub-title {+ font-size: 14px;+ color: #64676b;+ }+ }+ .text-grid {+ display: grid;+ grid-template-columns: 80px 1fr;+ grid-gap: 5px;+ margin-top: 5px;+ }+ .data-grid {+ display: grid;+ margin: 0 20px;+ grid-template-columns: repeat(2, 1fr);+ grid-gap: 15px;+ justify-content: center;+ align-items: center;+ .data-container {+ background-color: white;+ border-radius: 5px;+ padding: 5px;+ }+ .data-label{+ color: #606060;+ }+ .data-number {+ font-size: 18px;+ font-weight: 600;+ color: #2a2a2a;+ }+ }+ .product-info-container {+ margin: 10px 0;+ background-color: #FFFFFF;+ border-radius: 5px;+ text-align: center;+ }+}+.slide-fade-enter-active {+ transition: all 0.4s ease-out;+}+.slide-fade-enter-from{+ transform: translateX(300px);+ opacity: 0;+}+</style>\ No newline at end of filediff --git a/frontend/src/view/vwms/LoadingPage.vue b/frontend/src/view/vwms/LoadingPage.vuenew file mode 100644index 0000000..6329e5b--- /dev/null+++ b/frontend/src/view/vwms/LoadingPage.vue@@ -0,0 +1,58 @@+<!--+ @name : loading.vue+ @Description :+ @author : saal+ @date : 2023/5/17+-->+<template>+ <div class="mask">+ <div class="loading-title">+ <div>ModernWMS</div>+ </div>+ <div class="loading-progress-bar">+ <v-progress-linear+ :model-value="props.progress"+ color="indigo"+ height="25"+ striped+ >+ <strong>{{ props.progress }}%</strong>+ </v-progress-linear>+ </div>+ </div>+</template>++<script setup>+const props = defineProps({+ progress: {+ type: Number,+ required: true,+ default: 0+ }+})+</script>++<style scoped>+.mask {+ position: absolute;+ width: 100%;+ height: 100%;+ z-index: 1000;+ background-color: white;+ display: flex;+ align-items: center;+ flex-direction: column;+ justify-content: center;+}++.loading-progress-bar {+ width: 400px;+}++.loading-title {+ color: #9c27b0;+ font-weight: bold;+ font-size: 60px;+ margin-bottom: 20px;+}+</style>\ No newline at end of filediff --git a/frontend/src/view/vwms/ShelfGrid.vue b/frontend/src/view/vwms/ShelfGrid.vuenew file mode 100644index 0000000..1f5d1f5--- /dev/null+++ b/frontend/src/view/vwms/ShelfGrid.vue@@ -0,0 +1,100 @@+<!--+ @name : grid.vue+ @Description :+ @author : saal+ @date : 2023/10/10+-->+<template>+ <div class="shelf-container">+ <div> {{ props.shelfGridData?.shelf_name }}</div>+ <div class="info">货架规格:{{ props.shelfGridData?.layer }} * {{ props.shelfGridData?.column }}</div>+ <div :style="styleObject" class="shelf-grid" @click="selectProduct">+ <div+ v-for="(index) in formatIndex"+ :key="index"+ :class="{'have':props.shelfGridData?.products.includes(index), 'selected':index === selectIndex}"+ :data-index="index"+ class="product-grid"+ ></div>+ </div>+ </div>+</template>++<script setup>+import { computed } from 'vue'++const props = defineProps({+ shelfGridData: {+ type: Object+ },+ selectIndex: {+ type: Number+ }+})+const emit = defineEmits(['selectShelfItem'])+const styleObject = computed(() => ({+ gridTemplateColumns: `repeat(${ props.shelfGridData.column }, 1fr)`,+ gridTemplateRows: `repeat(${ props.shelfGridData.layer }, 1fr)`+}))++const formatIndex = computed(() => {+ const arr = Array.from({ length: props.shelfGridData.layer * props.shelfGridData.column }, (_, index) => index + 1)+ .reverse()+ const result = []+ for (let i = 0; i < arr.length; i += props.shelfGridData.column) {+ result.push(arr.slice(i, i + props.shelfGridData.column)+ .reverse())+ }+ return result.flat()+})++const selectProduct = (e) => {+ const index = parseInt(e.target.dataset.index)+ emit('selectShelfItem', index)+}+</script>++<style lang="less" scoped>++.shelf-container {+ position: absolute;+ left: 10px;+ top: 90px;+ padding: 15px;+ background-color: white;+ transition: all .5s ease-out;+ overflow: hidden;++ .header {+ display: flex;+ align-items: center;+ justify-content: space-between;+ }++ .shelf-grid {+ display: grid;+ margin: 10px 0;+ grid-gap: 2px;++ .product-grid {+ width: 40px;+ height: 40px;+ background-color: #d7d7d7;+ cursor: pointer;++ &:hover {+ box-shadow: rgba(50, 50, 93, 0.25) 0 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px, rgba(10, 37, 64, 0.35) 0px -2px 6px 0px inset;+ }+ }+ }+}++.have {+ background-color: #54a432 !important;+}++.selected {+ border: 3px solid #56a0ff;+}++</style>\ No newline at end of filediff --git a/frontend/src/view/vwms/VWms.vue b/frontend/src/view/vwms/VWms.vuenew file mode 100644index 0000000..54f38f1--- /dev/null+++ b/frontend/src/view/vwms/VWms.vue@@ -0,0 +1,522 @@+<!--+ @name : VWms.vue+ @Description :+ @author : saal+ @date : 2023/10/6+-->+<template>+ <div id="vwms" class="VWms-container">+ <Transition name="fade">+ <loading-page v-show="loading" :progress="loadingProgress" />+ </Transition>++ <div class="VWms-header">+ <div class="tooltip">+ <v-btn icon variant="text" @click="handleShowRightContainer">+ <v-tooltip activator="parent" location="bottom">{{ showRightContainer ? '收起' : '展开' }}右栏</v-tooltip>+ <v-icon :icon="`mdi-arrow-expand-${showRightContainer?'right':'left'}`"></v-icon>+ </v-btn>++ <v-btn icon variant="text" @click="toggleFullScreen">+ <v-tooltip activator="parent" location="bottom">全屏</v-tooltip>+ <v-icon :icon="`mdi-arrow-${fullScreen?'collapse':'expand'}`"></v-icon>+ </v-btn>++ <v-btn icon variant="text" @click="handleBreak">+ <v-tooltip activator="parent" location="bottom">回退</v-tooltip>+ <v-icon icon="mdi-reply"></v-icon>+ </v-btn>+ <v-btn v-if="presentData?.type === 'shelf' || presentData?.type === 'shelfItem'" @click="handleShelfGrid">+ {{ showShelfGrid ? '关闭' : '打开' }}货架二维视图+ </v-btn>+ </div>+ </div>+ <div class="VWMSIframe">+ <iframe+ ref="VWmsIframe"+ height="100%"+ src="/unity/index.html"+ width="100%"+ />+ </div>+ <div>+ <transition name="slide-fade-grid">+ <shelf-grid+ v-if="presentData?.type === 'shelf' && showShelfGrid || presentData?.type === 'shelfItem' && showShelfGrid"+ :select-index="selectShelfItemTagNumber"+ :shelf-grid-data="shelfGridData"+ @selectShelfItem="handleShelfGridSelect"+ ></shelf-grid>+ </transition>+ </div>+ <transition name="slide-fade-right">+ <div v-if="showRightContainer" class="right-container">+ <Detail :present-data="presentData"></Detail>+ <Bar :bar-data="barData"></Bar>+ <Pie :pie-data="pieData"></Pie>+ </div>+ </transition>+ </div>+</template>++<script lang="ts" setup>+import { useRoute } from 'vue-router'+import { onMounted, reactive, ref, watch } from 'vue'+import _ from 'lodash'+import screenfull from 'screenfull'+import LoadingPage from '@/view/vwms/LoadingPage.vue'+import { getGroupsData, handlePostJson } from '@/view/vwms/types/handleData'+import {+ factoryDataType,+ factoryInfoType,+ factoryShowDataType,+ formatDataType,+ productDataType,+ productInfoType,+ shelfDataType,+ shelfGridDataType,+ shelfItemDataType,+ shelfItemInfoType,+ shelfItemShowDataType,+ shelfShowDataType,+ warehouseInfoType,+ warehouseShowDataType+} from '@/view/vwms/types/types'+import Detail from '@/view/vwms/Detail.vue'+import Bar from '@/view/vwms/chat/Bar.vue'+import Pie from '@/view/vwms/chat/Pie.vue'+import ShelfGrid from '@/view/vwms/ShelfGrid.vue'+import { factoryData, productData, shelfItemData, warehouseData } from '@/view/vwms/data/data'++const VWmsIframe = ref()+const route = useRoute()+const loading = ref(true)+const warehouseId = parseInt(route.query.warehouseId as string)++onMounted(async () => {+ window.addEventListener('message', unityWatch)+})+const showRightContainer = ref(false)+const handleShowRightContainer = () => {+ showRightContainer.value = !showRightContainer.value+}+const showShelfGrid = ref(true)+const handleShelfGrid = () => {+ showShelfGrid.value = !showShelfGrid.value+}+const fullScreen = ref(false)+const toggleFullScreen = () => {+ if (screenfull.isEnabled) {+ const vwms = document.getElementById('vwms')+ screenfull.toggle(vwms!)+ fullScreen.value = !fullScreen.value+ }+}+const handleBreak = () => {+ VWmsIframe.value.contentWindow.parent.postMessage({+ guid: '',+ event: 'returnToUpper'+ }, '*')+}++const handleShelfGridSelect = (index) => {+ selectObjectList.push({+ itemName: 'shelfItem',+ itemId: index+ })+ VWmsIframe.value.contentWindow.parent.postMessage({+ guid: `shelfItem-${ index }`,+ event: 'selectShelfItem'+ }, '*')+}++const unityWatch = ({ data }) => {+ const {+ event,+ guid+ } = data+ const allowEvent = ['loadSuccess', 'select', 'selectBreak', 'loadingProgress']+ const unityEventHandleMap = {+ loadSuccess: handleLoadSuccess,+ select: handleSelect,+ selectBreak: handleSelectBreak,+ loadingProgress: handleLoadingProgress+ }+ if (allowEvent.includes(event)) {+ unityEventHandleMap[event](guid)+ }+}+const handleLoadSuccess = async () => {+ await initData()+ startPostJson()+ setTimeout(() => {+ loading.value = false+ showRightContainer.value = true+ }, 2500)+}++interface selectObjectType {+ itemName: string,+ itemId: number+}++const selectObjectList = reactive<selectObjectType[]>([])+const presentData = ref<warehouseShowDataType | factoryShowDataType | shelfShowDataType | shelfItemShowDataType>()++const handleSelect = (guid: string) => {+ const itemName = guid.split('-')[0]+ const itemId = parseInt(guid.split('-')[1])+ const allowSelectItemName = ['factory', 'shelf', 'shelfItem']+ if (allowSelectItemName.includes(itemName)) {+ selectObjectList.push({+ itemName,+ itemId+ })+ }+}++const handleSelectBreak = () => {+ if (selectObjectList.length > 1) {+ if (selectObjectList.length > 4) {+ selectObjectList.splice(2, selectObjectList.length - 2)+ } else {+ selectObjectList.pop()+ }+ }+}+const loadingProgress = ref()+const handleLoadingProgress = (progress) => {+ loadingProgress.value = Math.ceil(progress * 100)+}++const warehouseInfo = ref<warehouseInfoType>(warehouseData)+const factoryInfo = ref<factoryInfoType[]>(factoryData)+const shelfItemInfo = ref<shelfItemInfoType[]>(shelfItemData)+const productInfo = ref<productInfoType[]>(productData)+const formatData = ref<factoryDataType[]>([])+const selectFactoryData = ref<factoryDataType>()+const selectShelfName = ref()+const selectShelfItemTagNumber = ref()+const barData = ref()+const pieData = ref()++// 仓库 名称 地址 负责人 联系电话 email 库区数 总货物数+// 饼 存货类别占比(商品的类别) 柱 仓库库存大小+const getWarehouseData = (): warehouseShowDataType => {+ getWarehouseChatData()+ return {+ ...warehouseInfo.value!,+ factory_number: factoryInfo.value.length,+ warehouse_product_number: _.sumBy(productInfo.value, 'qty'),+ type: 'warehouse'+ }+}+// 仓库的图形数据+const getWarehouseChatData = () => {+ const barGroupsData = getGroupsData(productInfo.value, 'spu_name', 'qty')+ .slice(0, 6)+ const barTitle = '库存商品量'+ barData.value = {+ barTitle,+ barGroupsData+ }++ const pieGroupsData = _.map(formatData.value, (obj) => {+ const totalQty = _.sumBy(obj.shelves, (shelf) => _.sumBy(shelf.shelfItems, (item) => _.sumBy(item.product, 'qty')))+ return {+ name: obj.area_name,+ value: totalQty+ }+ })++ const xData = _.map(pieGroupsData, 'name')+ const yData = _.map(pieGroupsData, 'value')+ const pieTitle = '库区容量'+ pieData.value = {+ pieTitle,+ xData,+ yData+ }+}++// 库区 名称 类型 货架数 库位数 剩余库位 已用空间+// 饼 存货类别占比 柱 货架库存大小+const getFactoryData = (id: number): factoryShowDataType => {+ const factory = _.filter(formatData.value, { id })[0]+ selectFactoryData.value = factory+ const factoryShelf = factory.shelves+ const factoryShelfItemNumber = _.sumBy(factoryShelf, shelf => shelf.layer * shelf.column)+ const usedFactoryShelfItem = _.flatMap(factoryShelf, shelf => _.flatMap(shelf.shelfItems, shelfItem => shelfItem.product))+ getFactoryChatData(usedFactoryShelfItem, factoryShelf)+ return {+ area_name: factory.area_name,+ area_property: factory.area_property,+ shelf_number: factoryShelf.length,+ shelf_item_number: factoryShelfItemNumber,+ surplus_number: factoryShelfItemNumber - usedFactoryShelfItem.length,+ factory_product_number: _.sumBy(usedFactoryShelfItem, 'qty'),+ type: 'factory'+ }+}++// 库区的图形数据+const getFactoryChatData = (usedFactoryShelfItem, factoryShelf) => {+ const barGroupsData = getGroupsData(usedFactoryShelfItem, 'spu_name', 'qty')+ .slice(0, 6)+ const barTitle = '库区库存商品量'+ barData.value = {+ barTitle,+ barGroupsData+ }+ const pieGroupsData = _.map(factoryShelf, obj => {+ const totalQty = _.sumBy(obj.shelfItems, (item: shelfItemDataType) => _.sumBy(item.product, 'qty'))+ return {+ name: obj.shelf_name,+ value: totalQty+ }+ })++ const xData = _.map(pieGroupsData, 'name')+ const yData = _.map(pieGroupsData, 'value')+ const pieTitle = '货架容量'+ pieData.value = {+ pieTitle,+ xData,+ yData+ }+}++const shelfGridData = ref<shelfGridDataType>()+// 货架 名称 规格 闲置位 总货物数+// 饼 存货类别占比 柱 库位存量大小+const getShelfData = (id: number): shelfShowDataType => {+ const shelf: shelfDataType = selectFactoryData.value?.shelves.filter(shelf => shelf.shelf_name === `${ id }`)[0] as shelfDataType+ const shelfProduct: productDataType[] = _.flatMap(shelf.shelfItems, shelfItem => shelfItem.product)+ selectShelfName.value = shelf.shelf_name+ getShelfChatData(shelfProduct, shelf)+ // 货架二维图数据+ shelfGridData.value = {+ shelf_name: `${ shelf.shelf_name }号货架`,+ layer: shelf.layer,+ column: shelf.column,+ products: shelf.shelfItems.map(shelfItem => {+ if (shelfItem.product.length > 0) return parseInt(shelfItem.tag_number)+ return 0+ })+ }++ return {+ shelf_name: `${ shelf.shelf_name }号货架`,+ layer: shelf.layer,+ column: shelf.column,+ surplus_number: shelf.layer * shelf.column - _.sumBy(shelf.shelfItems, shelfItem => shelfItem.product.length),+ shelf_product_number: _.sumBy(shelfProduct, 'qty'),+ type: 'shelf'+ }+}++// 货架的图形数据+const getShelfChatData = (shelfProduct, shelf) => {+ const barGroupsData = getGroupsData(shelfProduct, 'sku_name', 'qty')+ const barTitle = '货架商品规格量'+ barData.value = {+ barTitle,+ barGroupsData+ }+ const pieGroupsData = _.map(shelf.shelfItems, (item) => {+ const totalQty = _.sumBy(item.product, 'qty')+ return {+ name: item.location_name,+ value: totalQty+ }+ })++ const xData = _.map(pieGroupsData, 'name')+ const yData = _.map(pieGroupsData, 'value')+ const pieTitle = '库位容量'+ pieData.value = {+ pieTitle,+ xData,+ yData+ }+}++// 货物 层号 库位号 库位编码+// 列表 商品名称 规格名称 数量 可用数量 货主+const getShelfItemData = (id: number): shelfItemShowDataType | any => {+ const shelf = _.filter(selectFactoryData.value?.shelves, { shelf_name: selectShelfName.value })[0]+ const shelfItem = _.filter(shelf.shelfItems, { tag_number: `${ id }` })[0]+ selectShelfItemTagNumber.value = id+ if (shelfItem) {+ return {+ ...shelfItem,+ type: 'shelfItem'+ }+ }+ return {+ tag_number: id,+ location_name: '无',+ layer_number: Math.ceil(id / shelf.column),+ product: [],+ type: 'shelfItem'+ }+}++watch(selectObjectList, () => {+ const targetData = selectObjectList[selectObjectList.length - 1]+ const handleMap = {+ playground: getWarehouseData,+ factory: getFactoryData,+ shelf: getShelfData,+ shelfItem: getShelfItemData+ }+ console.log(targetData)+ presentData.value = handleMap[targetData.itemName](targetData.itemId)+})++const initData = async () => {+ // try {+ // const promises = [+ // await getWarehouse(warehouseId),+ // await getWarehouseAreaSelect(warehouseId),+ // await getGoodsLocation(),+ // await getWarehouseProduct({ warehouse_id: warehouseId })+ // ]+ // const responses: any = await Promise.all(promises)+ // warehouseInfo.value = responses[0].data.data+ // factoryInfo.value = responses[1].data.data+ // shelfItemInfo.value = responses[2].data.data+ // productInfo.value = responses[3].data.data+ // } catch (error) {+ // loading.value = true+ // }+ selectObjectList.push({+ itemName: 'playground',+ itemId: warehouseId+ })+ const data: formatDataType = handlePostJson(factoryInfo.value, shelfItemInfo.value, productInfo.value)+ formatData.value = data.area+}++const startPostJson = () => {+ const data: formatDataType = handlePostJson(factoryInfo.value, shelfItemInfo.value, productInfo.value)+ try {+ VWmsIframe.value.contentWindow.parent.postMessage({+ guid: JSON.stringify(data),+ event: 'sendData'+ }, '*')+ } catch (error) {+ console.log(error)+ }+}++</script>++<style lang="less" scoped>+* {+ box-sizing: border-box;+}++.VWms-container {+ letter-spacing: 1px;+ width: 100%;+ height: 100%;+ overflow: hidden;+ position: relative;+ display: flex;+ align-items: center;+ justify-content: center;+ background-color: #317972;+}++:deep(.v-divider) {+ margin: 10px 0;+}++.VWms-header {+ position: absolute;+ top: 10px;+ left: 10px;+ z-index: 10;+ display: flex;+ align-items: center;+ background-color: rgba(255, 255, 255, 0.9);+ padding: 5px;+ border-radius: 4px;+}++.VWMSIframe {+ width: 100%;+ height: 100%;+ border: none;+ position: absolute;+}++.right-container {+ display: grid;+ grid-template-columns: 400px;+ grid-gap: 15px;+ position: absolute;+ right: 0;+ height: 100%;+ overflow: auto;+ padding: 10px;+ justify-content: center++}++.flex-center {+ display: flex;+ align-items: center;+ justify-content: space-between;+}++::-webkit-scrollbar {+ display: none+}++.VWms-card {+ border-radius: 5px;+ padding: 15px;+ width: 100%;+ background-color: rgba(255, 255, 255, 0.9);+}++.fade-enter-active,+.fade-leave-active {+ transition: opacity 0.3s ease;+}++.fade-enter-from,+.fade-leave-to {+ opacity: 0;+}++.slide-fade-grid-enter-active {+ transition: all 0.3s ease-out;+}++.slide-fade-grid-leave-active {+ transition: all 0.5s ease-out;+}++.slide-fade-grid-enter-from,+.slide-fade-grid-leave-to {+ transform: translateX(-200px);+ opacity: 0;+}++.slide-fade-right-enter-active {+ transition: all 0.3s ease-out;+}++.slide-fade-right-leave-active {+ transition: all 0.5s ease-out;+}++.slide-fade-right-enter-from,+.slide-fade-right-leave-to {+ transform: translateX(200px);+ opacity: 0;+}+</style>\ No newline at end of filediff --git a/frontend/src/view/vwms/chat/Bar.vue b/frontend/src/view/vwms/chat/Bar.vuenew file mode 100644index 0000000..40e651b--- /dev/null+++ b/frontend/src/view/vwms/chat/Bar.vue@@ -0,0 +1,70 @@+<!--+ @name : Bar.vue+ @Description :+ @author : saal+ @date : 2023/10/9+-->+<template>+ <div class="VWms-card">+ <div>{{ props.barData?.barTitle }}</div>+ <v-divider></v-divider>+ <div ref="chatRef" class="chat"></div>+ </div>+</template>++<script lang="ts" setup>+import { onMounted, ref, watch } from 'vue'+import * as echarts from 'echarts'++const props = defineProps({+ barData: Object,+})++onMounted(() => {+ initCharts()+})+const chatRef = ref()+let chat:any+const initCharts = () => {+ if (chat) {+ chat.dispose()+ }+ chat = echarts.init(chatRef.value)+ chat.setOption({+ tooltip: {+ trigger: 'item'+ },+ series: [+ {+ name: '个数',+ type: 'pie',+ radius: '50%',+ data: props.barData?.barGroupsData,+ emphasis: {+ itemStyle: {+ shadowBlur: 10,+ shadowOffsetX: 0,+ shadowColor: 'rgba(0, 0, 0, 0.5)'+ }+ },+ label: {+ show: true,+ position: 'outside',+ formatter: '{b} : {d}%'+ },+ },+ ]+ })+}+watch(() => props.barData, initCharts)+</script>++<style lang="less" scoped>+.chat{+ display: flex;+ align-items: center;+ justify-content: center;+ width:100%;+ height: 250px;+}+</style>\ No newline at end of filediff --git a/frontend/src/view/vwms/chat/Pie.vue b/frontend/src/view/vwms/chat/Pie.vuenew file mode 100644index 0000000..83ac438--- /dev/null+++ b/frontend/src/view/vwms/chat/Pie.vue@@ -0,0 +1,77 @@+<!--+ @name : Pie.vue+ @Description :+ @author : saal+ @date : 2023/10/9+-->+<template>+ <div class="VWms-card">+ <div>{{ props.pieData?.pieTitle }}</div>+ <v-divider></v-divider>+ <div ref="chatRef" class="chat"></div>+ </div>+</template>++<script lang="ts" setup>+import { onMounted, ref, watch } from 'vue'+import * as echarts from 'echarts'++const props = defineProps({+ pieData: Object,+})+onMounted(() => {+ initCharts()+})+const chatRef = ref()+let chat:any+const initCharts = () => {+ if (chat) {+ chat.dispose()+ }+ chat = echarts.init(chatRef.value)+ chat.setOption({+ xAxis: {+ type: 'category',+ data: props.pieData?.xData,+ },+ yAxis: {+ type: 'value'+ },+ tooltip: {+ trigger: 'axis',+ axisPointer: {+ type: 'shadow'+ }+ },+ series: [+ {+ data: props.pieData?.yData,+ type: 'bar',+ showBackground: true,+ backgroundStyle: {+ color: 'rgba(180, 180, 180, 0.2)'+ },+ tooltip: {+ valueFormatter(value) {+ return `存货数量:${ value }`+ }+ },+ markLine: {+ data: [{ type: 'average', name: 'Avg' }]+ },+ }+ ]+ })+}+watch(() => props.pieData, initCharts)+</script>++<style lang="less" scoped>+.chat{+ display: flex;+ align-items: center;+ justify-content: center;+ width: 100%;+ height: 300px;+}+</style>\ No newline at end of filediff --git a/frontend/src/view/vwms/data/data.ts b/frontend/src/view/vwms/data/data.tsnew file mode 100644index 0000000..cbcbe88--- /dev/null+++ b/frontend/src/view/vwms/data/data.ts@@ -0,0 +1,479 @@+import { factoryInfoType, productInfoType, shelfItemInfoType, warehouseInfoType } from '@/view/vwms/types/types'++const factoryData: factoryInfoType[] = [+ {+ id: 573,+ warehouse_id: 1688,+ warehouse_name: '',+ area_name: '猛牛一号仓存货区',+ parent_id: 0,+ create_time: '2023-10-07 09:05:15',+ last_update_time: '2023-10-07 09:05:15',+ is_valid: true,+ tenant_id: 2757,+ area_property: 6+ },+ {+ id: 574,+ warehouse_id: 1688,+ warehouse_name: '',+ area_name: '猛牛一号仓拣货区',+ parent_id: 0,+ create_time: '2023-10-07 09:05:29',+ last_update_time: '2023-10-07 09:05:29',+ is_valid: true,+ tenant_id: 2757,+ area_property: 1+ },+ {+ id: 575,+ warehouse_id: 1688,+ warehouse_name: '',+ area_name: '猛牛一号仓备货区',+ parent_id: 0,+ create_time: '2023-10-07 09:05:44',+ last_update_time: '2023-10-07 09:05:44',+ is_valid: true,+ tenant_id: 2757,+ area_property: 2+ },+ {+ id: 576,+ warehouse_id: 1688,+ warehouse_name: '',+ area_name: '猛牛一号仓收货区',+ parent_id: 0,+ create_time: '2023-10-07 09:05:59',+ last_update_time: '2023-10-07 09:05:59',+ is_valid: true,+ tenant_id: 2757,+ area_property: 3+ }+]+const shelfItemData:shelfItemInfoType[] = [+ {+ id: 441,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-1-5-45',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '5',+ tag_number: '45',+ create_time: '2023-10-07 09:08:29',+ last_update_time: '2023-10-07 14:22:15',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 441,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-1-2-11',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '2',+ tag_number: '11',+ create_time: '2023-10-07 09:08:29',+ last_update_time: '2023-10-07 14:22:15',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 442,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-1-2-18',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '2',+ tag_number: '18',+ create_time: '2023-10-07 09:09:02',+ last_update_time: '2023-10-07 10:29:25',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 443,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-1-2-17',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '2',+ tag_number: '17',+ create_time: '2023-10-07 09:10:00',+ last_update_time: '2023-10-07 10:29:01',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 444,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-1-5-41',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '5',+ tag_number: '41',+ create_time: '2023-10-07 09:10:00',+ last_update_time: '2023-10-07 10:29:01',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 444,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-2-4-2',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '3',+ shelf_number: '2',+ layer_number: '4',+ tag_number: '11',+ create_time: '2023-10-07 09:10:31',+ last_update_time: '2023-10-07 14:23:00',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 445,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-3-2-6',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '2',+ shelf_number: '3',+ layer_number: '2',+ tag_number: '6',+ create_time: '2023-10-07 09:10:54',+ last_update_time: '2023-10-07 09:11:35',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 446,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-4-3-6',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '1',+ shelf_number: '4',+ layer_number: '3',+ tag_number: '14',+ create_time: '2023-10-07 09:11:19',+ last_update_time: '2023-10-07 14:24:29',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ },+ {+ id: 447,+ warehouse_id: 1689,+ warehouse_name: '猛牛二号仓库',+ warehouse_area_name: '猛牛二号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-2-1-5-5',+ location_length: 5.00,+ location_width: 5.00,+ location_heigth: 5.00,+ location_volume: 5.00,+ location_load: 5.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '5',+ tag_number: '15',+ create_time: '2023-10-07 09:12:26',+ last_update_time: '2023-10-07 14:24:36',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 577+ },+ {+ id: 448,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓拣货区',+ warehouse_area_property: 1,+ location_name: 'mn-1-1-3-10',+ location_length: 0.00,+ location_width: 0.00,+ location_heigth: 0.00,+ location_volume: 0.00,+ location_load: 0.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '3',+ tag_number: '10',+ create_time: '2023-10-11 14:50:48',+ last_update_time: '2023-10-11 14:50:59',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 574+ },+ {+ id: 449,+ warehouse_id: 1688,+ warehouse_name: '猛牛一号仓库',+ warehouse_area_name: '猛牛一号仓存货区',+ warehouse_area_property: 6,+ location_name: 'mn-1-1-3-14',+ location_length: 0.00,+ location_width: 0.00,+ location_heigth: 0.00,+ location_volume: 0.00,+ location_load: 0.00,+ roadway_number: '5',+ shelf_number: '1',+ layer_number: '3',+ tag_number: '14',+ create_time: '2023-10-11 14:53:24',+ last_update_time: '2023-10-11 14:53:24',+ is_valid: true,+ tenant_id: 2757,+ warehouse_area_id: 573+ }+]+const productData:productInfoType[] = [+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-3-10',+ spu_code: 'candy',+ spu_name: '猛牛奶糖',+ sku_id: 767,+ sku_code: 'candy2',+ sku_name: '打包奶糖',+ qty: 200,+ qty_available: 200,+ qty_locked: 0,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 448+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-5-6',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 766,+ sku_code: 'mnmilk1',+ sku_name: '猛牛小瓶牛奶',+ qty: 50,+ qty_available: 0,+ qty_locked: 50,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 441+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-2-8',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 766,+ sku_code: 'mnmilk1',+ sku_name: '猛牛小瓶牛奶',+ qty: 100,+ qty_available: 0,+ qty_locked: 100,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 442+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-2-7',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 766,+ sku_code: 'mnmilk1',+ sku_name: '猛牛小瓶牛奶',+ qty: 150,+ qty_available: 0,+ qty_locked: 150,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 443+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-2-4-2',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 766,+ sku_code: 'mnmilk1',+ sku_name: '猛牛小瓶牛奶',+ qty: 200,+ qty_available: 0,+ qty_locked: 200,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 444+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-3-2-6',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 766,+ sku_code: 'mnmilk1',+ sku_name: '猛牛小瓶牛奶',+ qty: 50,+ qty_available: 10,+ qty_locked: 40,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 445+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-4-3-6',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 766,+ sku_code: 'mnmilk1',+ sku_name: '猛牛小瓶牛奶',+ qty: 50,+ qty_available: 50,+ qty_locked: 0,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 446+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-3-14',+ spu_code: 'mnmilk',+ spu_name: '猛牛牛奶',+ sku_id: 765,+ sku_code: 'mnmilk2',+ sku_name: '猛牛大瓶牛奶',+ qty: 300,+ qty_available: 300,+ qty_locked: 0,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 449+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-2-8',+ spu_code: 'ssa',+ spu_name: '酸奶',+ sku_id: 770,+ sku_code: 'ssa1',+ sku_name: '小盒酸奶',+ qty: 100,+ qty_available: 100,+ qty_locked: 0,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 442+ },+ {+ warehouse_name: '猛牛一号仓库',+ location_name: 'mn-1-1-2-8',+ spu_code: 'ssa',+ spu_name: '酸奶',+ sku_id: 769,+ sku_code: 'ssa2',+ sku_name: '大盒酸奶',+ qty: 600,+ qty_available: 600,+ qty_locked: 0,+ qty_frozen: 0,+ goods_owner_name: '空',+ series_number: '',+ goods_location_id: 442+ }+]+const warehouseData:warehouseInfoType = {+ id: 1688,+ warehouse_name: '猛牛一号仓库',+ city: '福州',+ address: '福州市仓山区',+ email: '[email protected]',+ manager: '空',+ contact_tel: '15359879255',+ creator: 'saals',+ create_time: '2023-10-07 09:03:20',+ last_update_time: '2023-10-12 10:35:16',+ is_valid: true,+ tenant_id: 2757+}++export {+ factoryData,+ shelfItemData,+ productData,+ warehouseData+}\ No newline at end of filediff --git a/frontend/src/view/vwms/types/handleData.ts b/frontend/src/view/vwms/types/handleData.tsnew file mode 100644index 0000000..7ea466b--- /dev/null+++ b/frontend/src/view/vwms/types/handleData.ts@@ -0,0 +1,65 @@+import _ from 'lodash'+import {+ factoryDataType,+ factoryInfoType,+ formatDataType,+ productInfoType,+ shelfDataType,+ shelfItemInfoType+} from '@/view/vwms/types/types'++export const handlePostJson = (warehouseAreaInfo: factoryInfoType[], goodsLocationInfo: shelfItemInfoType[], productInfo: productInfoType[]) => {+ const data: formatDataType = {+ area: [],+ }+ warehouseAreaInfo.forEach(areaItem => {+ const warehouseProduct = goodsLocationInfo.filter(item => item.warehouse_area_id == areaItem.id)+ const shelfList = Object.values(_.groupBy(warehouseProduct, 'shelf_number'))+ const shelves: shelfDataType[] = []+ shelfList.forEach(item => {+ const { layer, column } = getShelfSpec(item)+ const shelf:shelfDataType = {+ shelf_name: item[0].shelf_number,+ layer,+ column,+ shelfItems: getShelfProduct(item, productInfo)+ }+ shelves.push(shelf)+ })+ const areaItemInfo:factoryDataType = {+ ...areaItem,+ shelves+ }+ data.area.push(areaItemInfo)+ })+ return data+}++export const getShelfSpec = (shelfItemList) => {+ const maxLayerObj: any = _.maxBy(shelfItemList, 'layer_number')+ const maxTagNumber = parseInt(maxLayerObj.tag_number)+ let layer = parseInt(maxLayerObj.layer_number)+ let column = Math.ceil(maxTagNumber / layer)+ if (layer < 3 && column < 3) {+ layer = 3+ column = 3+ }+ return { layer, column }+}++const getShelfProduct = (shelfItemList, productInfo) => _.flatMap(shelfItemList, (shelfItem) => {+ const product = _.filter(productInfo, { goods_location_id: shelfItem.id })+ return { ...shelfItem, product: [...product] }+})++interface groupsDataType{+ name:string,+ value:number+}+export const getGroupsData = (data:any, attr:string, val:string):groupsDataType[] => {+ const groups = _.groupBy(data, attr)+ return _.map(groups, (items, spu_name) => {+ const total_price = _.sumBy(items, val)+ return { value: total_price, name: spu_name }+ })+}diff --git a/frontend/src/view/vwms/types/types.ts b/frontend/src/view/vwms/types/types.tsnew file mode 100644index 0000000..27d3b25--- /dev/null+++ b/frontend/src/view/vwms/types/types.ts@@ -0,0 +1,123 @@+export interface warehouseInfoType {+ address:string,+ city:string,+ contact_tel:string,+ create_time:string,+ creator:string,+ email:string | null,+ id:number,+ manager:string,+ is_valid:boolean,+ last_update_time:string,+ tenant_id:number,+ warehouse_name:string+}+export interface factoryInfoType {+ area_name:string,+ area_property:number,+ create_time:string,+ id:number,+ is_valid:boolean,+ last_update_time:string,+ warehouse_id:number,+ warehouse_name:string,+ parent_id:number,+ tenant_id:number,+}+export interface shelfItemInfoType {+ id:number,+ warehouse_name:string,+ warehouse_area_property:number,+ layer_number:string,+ location_heigth:number,+ location_length:number,+ location_load:number,+ location_name:string,+ location_volume:number,+ location_width:number,+ roadway_number:string,+ shelf_number:string,+ tag_number:string,+ warehouse_area_id:number,+ warehouse_area_name:string,+ warehouse_id:number,+ create_time:string,+ last_update_time:string,+ is_valid:boolean,+ tenant_id:number+}+export interface productInfoType {+ goods_location_id:number,+ goods_owner_name:string,+ location_name:string,+ qty:number,+ qty_available:number,+ qty_frozen:number,+ qty_locked:number,+ series_number:string | null,+ sku_code:string,+ sku_id:number,+ sku_name:string,+ spu_code:string,+ spu_name:string,+ warehouse_name:string+}++// 整理传递给unity的数据+export type productDataType = productInfoType+export interface shelfItemDataType extends shelfItemInfoType {+ product:productDataType[]+}+export interface shelfDataType {+ shelf_name:string,+ layer:number,+ column:number,+ shelfItems:shelfItemDataType[],+}+export interface factoryDataType extends factoryInfoType {+ shelves:shelfDataType[]+}+export interface formatDataType {+ area:factoryDataType[]+}++// 展示数据+export interface warehouseShowDataType extends warehouseInfoType{+ factory_number:number,+ warehouse_product_number:number,+ type:string+}++export interface factoryShowDataType {+ area_name:string,+ area_property:number,+ shelf_number:number,+ shelf_item_number:number,+ // 剩余库位数量+ surplus_number:number,+ // 已存货物数+ factory_product_number:number,+ type:string+}++export interface shelfGridDataType {+ shelf_name:string,+ layer:number,+ column:number,+ products:number[]+}+export interface shelfShowDataType {+ shelf_name:string,+ layer:number,+ column:number,+ // 闲置数+ surplus_number:number,+ // 已存商品数+ shelf_product_number:number,+ type:string+}++export interface shelfItemShowDataType extends shelfItemInfoType{+ product:productInfoType[],+ type:string+}\ No newline at end of filediff --git a/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vueindex 0098397..5eda30b 100644--- a/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue+++ b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue@@ -12,8 +12,10 @@<!-- Operate Btn --><v-col cols="3" class="col"><!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn> -->- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -70,7 +72,12 @@:title="$t('wms.warehouseWorking.warehouseAdjust.handle_time')"></vxe-column> --><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseAdjust.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseAdjust.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseAdjust.create_time')"+ ></vxe-column><!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="200" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -124,7 +131,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch, nextTick, onActivated } from 'vue'+import { computed, ref, reactive, watch, nextTick, onActivated, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { WarehouseAdjustVO } from '@/types/WarehouseWorking/WarehouseAdjust'@@ -133,14 +140,14 @@ import { hookComponent } from '@/components/system'import { deleteStockAdjust, getStockAdjustList, getStockAdjustOne, confirmStockAdjust } from '@/api/wms/warehouseAdjust'import { PROCESS_JOB_COMBINE } from '@/constant/warehouseWorking'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { formatAdjustJobType } from '@/utils/format/formatWarehouseWorking'-import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-adjust.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -174,7 +181,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -327,6 +337,23 @@ onActivated(() => {method.refresh()})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({ hasTab: false }))const tableHeight = computed(() => computedTableHeight({ hasTab: false }))diff --git a/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vueindex 2024018..59a9877 100644--- a/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue@@ -3,7 +3,7 @@<v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true"><template #default><v-card>- <v-toolbar class="" color="white" :title="`${$t('router.sideBar.warehouseFreeze')}(${jobTypeComp})`"></v-toolbar>+ <v-toolbar class="" color="white" :title="`${jobTypeComp}`"></v-toolbar><v-card-text><v-form ref="formRef"><v-text-field@@ -30,6 +30,7 @@variant="outlined"disabled></v-text-field>+ <v-text-field v-model="data.form.series_number" :label="$t('wms.stockLocation.series_number')" variant="outlined" disabled></v-text-field><v-text-fieldv-model="data.form.location_name":label="$t('wms.warehouseWorking.warehouseFreeze.location_name')"@@ -86,8 +87,8 @@ const props = defineProps<{const isShow = computed(() => props.showDialog)const jobTypeComp = computed(() => (data.form.job_type === FREEZE_JOB_FREEZE- ? i18n.global.t('wms.warehouseWorking.warehouseFreeze.freeze')- : i18n.global.t('wms.warehouseWorking.warehouseFreeze.unfreeze')))+ ? i18n.global.t('base.roleMenu.operationTitle.stock') + i18n.global.t('wms.warehouseWorking.warehouseFreeze.freeze')+ : i18n.global.t('base.roleMenu.operationTitle.stock') + i18n.global.t('wms.warehouseWorking.warehouseFreeze.unfreeze')))// Unfreeze should be filter freezed.const commoditySqlTitle = computed(() => (data.form.job_type === FREEZE_JOB_UNFREEZE ? 'frozen' : ''))@@ -112,6 +113,7 @@ const data = reactive({spu_code: '',spu_name: '',sku_code: '',+ series_number: '',creator: '',create_time: ''}),@@ -160,6 +162,7 @@ const method = reactive({data.form.spu_code = selectRecords[0].spu_codedata.form.spu_name = selectRecords[0].spu_namedata.form.sku_code = selectRecords[0].sku_code+ data.form.series_number = selectRecords[0].series_numberdata.form.goods_owner_id = selectRecords[0].goods_owner_iddata.form.goods_location_id = selectRecords[0].goods_location_iddiff --git a/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vueindex 5d24eb0..0e5c0da 100644--- a/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue@@ -11,7 +11,7 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn+ <!-- <tooltip-btnicon="mdi-lock-open-outline":tooltip-text="$t('wms.warehouseWorking.warehouseFreeze.freeze')"@click="method.add(FREEZE_JOB_FREEZE)"@@ -22,7 +22,9 @@@click="method.add(FREEZE_JOB_UNFREEZE)"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -71,11 +73,14 @@<vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"></vxe-column><vxe-column field="spu_name" width="150px" :title="$t('base.commodityManagement.spu_name')"></vxe-column><vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="series_number" width="150px" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.handler')"></vxe-column>- <vxe-column field="handle_time" width="170px" :title="$t('wms.warehouseWorking.warehouseFreeze.handle_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column+ field="handle_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseFreeze.handle_time')"+ ></vxe-column><!-- <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseFreeze.creator')"></vxe-column><vxe-column@@ -134,7 +139,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { computed, ref, reactive, onActivated, watch, nextTick, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight } from '@/constant/style'import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'@@ -144,14 +149,14 @@ import { hookComponent } from '@/components/system'import { formatFreezeJobType } from '@/utils/format/formatWarehouseWorking'import { getStockFreezeList, getStockFreezeOne } from '@/api/wms/warehouseFreeze'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { formatDate } from '@/utils/format/formatSystem'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-freeze.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -180,6 +185,7 @@ const data = reactive({spu_code: '',spu_name: '',sku_code: '',+ series_number: '',creator: '',create_time: ''},@@ -188,7 +194,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -211,6 +220,7 @@ const method = reactive({spu_code: '',spu_name: '',sku_code: '',+ series_number: '',creator: '',create_time: ''}@@ -319,6 +329,39 @@ onActivated(() => {method.refresh()})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('wms.warehouseWorking.warehouseFreeze.freeze'),+ icon: 'mdi-lock-open-outline',+ code: 'freeze',+ click: () => {+ method.add(FREEZE_JOB_FREEZE)+ }+ },+ {+ name: i18n.global.t('wms.warehouseWorking.warehouseFreeze.unfreeze'),+ icon: 'mdi-lock-open-variant-outline',+ code: 'unfreeze',+ click: () => {+ method.add(FREEZE_JOB_UNFREEZE)+ }+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({ hasTab: false }))const tableHeight = computed(() => computedTableHeight({ hasTab: false }))diff --git a/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vueindex fd2e9a0..d1e310f 100644--- a/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue+++ b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue@@ -1,6 +1,6 @@<!-- Warehouse Move Operate Dialog --><template>- <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <v-dialog v-model="isShow" :width="'60%'" transition="dialog-top-transition" :persistent="true"><template #default><v-card><v-toolbar color="white" :title="`${$t('router.sideBar.warehouseMove')}`">@@ -8,74 +8,105 @@</v-toolbar><v-card-text><v-form ref="formRef">- <v-text-field- v-model="data.form.spu_code"- :label="$t('base.commodityManagement.spu_code')"- :rules="data.rules.spu_code"- variant="outlined"- readonly- clearable- @click="method.openCommoditySelect"- @click:clear="method.clearCommodity"- ></v-text-field>- <v-text-field- v-model="data.form.spu_name"- :label="$t('base.commodityManagement.spu_name')"- :rules="data.rules.spu_name"- variant="outlined"- disabled- ></v-text-field>- <v-text-field- v-model="data.form.sku_code"- :label="$t('base.commodityManagement.sku_code')"- :rules="data.rules.sku_code"- variant="outlined"- disabled- ></v-text-field>- <!-- <v-text-field- v-model="data.form.sku_name"- :label="$t('base.commodityManagement.sku_name')"- :rules="data.rules.sku_name"- variant="outlined"- disabled- ></v-text-field> -->- <v-text-field- v-model="data.form.orig_goods_warehouse"- :label="$t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse')"- :rules="data.rules.orig_goods_warehouse"- variant="outlined"- disabled- ></v-text-field>- <v-text-field- v-model="data.form.orig_goods_location_name"- :label="$t('wms.warehouseWorking.warehouseMove.orig_goods_location_name')"- :rules="data.rules.orig_goods_location_name"- variant="outlined"- disabled- ></v-text-field>- <v-text-field- v-model="data.form.dest_googs_warehouse"- :label="$t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse')"- :rules="data.rules.dest_googs_warehouse"- variant="outlined"- disabled- ></v-text-field>- <v-text-field- v-model="data.form.dest_googs_location_name"- :label="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"- :rules="data.rules.dest_googs_location_name"- variant="outlined"- readonly- clearable- @click="method.openLocationSelect"- @click:clear="method.clearLocation"- ></v-text-field>- <v-text-field- v-model="data.form.qty"- :label="$t('wms.warehouseWorking.warehouseMove.qty')"- :rules="data.rules.qty"- variant="outlined"- ></v-text-field>+ <v-row>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ @click="method.openCommoditySelect"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ </v-col>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-col>+ </v-row>++ <v-row>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-col>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.series_number"+ :label="$t('wms.stockLocation.series_number')"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-col>+ </v-row>++ <v-row>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.orig_goods_warehouse"+ :label="$t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse')"+ :rules="data.rules.orig_goods_warehouse"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-col>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.orig_goods_location_name"+ :label="$t('wms.warehouseWorking.warehouseMove.orig_goods_location_name')"+ :rules="data.rules.orig_goods_location_name"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-col>+ </v-row>++ <v-row>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.dest_googs_warehouse"+ :label="$t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse')"+ :rules="data.rules.dest_googs_warehouse"+ variant="outlined"+ disabled+ ></v-text-field>+ </v-col>+ <v-col :cols="6">+ <v-text-field+ v-model="data.form.dest_googs_location_name"+ :label="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"+ :rules="data.rules.dest_googs_location_name"+ variant="outlined"+ readonly+ clearable+ @click="method.openLocationSelect"+ @click:clear="method.clearLocation"+ ></v-text-field>+ </v-col>+ </v-row>++ <v-row>+ <v-col :cols="12">+ <v-text-field+ v-model="data.form.qty"+ :label="$t('wms.warehouseWorking.warehouseMove.qty')"+ :rules="data.rules.qty"+ variant="outlined"+ ></v-text-field>+ </v-col>+ </v-row></v-form></v-card-text><v-card-actions class="justify-end">@@ -111,7 +142,10 @@ const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])const isUpdate = computed(() => props.form.id && props.form.id > 0)const operateDisabled = computed(() => !!isUpdate.value)-const qrCodeValue = computed(() => data.form.id.toString())+const qrCodeValue = computed(() => JSON.stringify({+ id: data.form.id.toString(),+ type: 'warehouseMove'+ }))const props = defineProps<{showDialog: boolean@@ -146,6 +180,7 @@ const data = reactive({spu_name: '',sku_code: '',sku_name: '',+ series_number: '',creator: '',create_time: ''}),@@ -226,6 +261,7 @@ const method = reactive({data.form.spu_name = selectRecords[0].spu_namedata.form.sku_code = selectRecords[0].sku_codedata.form.sku_name = selectRecords[0].sku_name+ data.form.series_number = selectRecords[0].series_numberdata.curAvailableQty = selectRecords[0].qty_available} catch (error) {@@ -307,10 +343,4 @@ watch()</script>-<style scoped lang="less">-.v-form {- div {- margin-bottom: 7px;- }-}-</style>+<style scoped lang="less"></style>diff --git a/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vueindex 1660348..4e1afff 100644--- a/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue+++ b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue@@ -11,9 +11,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -82,14 +84,21 @@width="150px":title="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseMove.creator')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseMove.create_time')"+ ></vxe-column><vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.handler')"></vxe-column>- <vxe-column field="handle_time" width="170px" :title="$t('wms.warehouseWorking.warehouseMove.handle_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column+ field="handle_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseMove.handle_time')"+ ></vxe-column>- <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseMove.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseMove.create_time')"></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -102,15 +111,15 @@:flat="true"icon="mdi-book-open-outline":tooltip-text="$t('wms.warehouseWorking.warehouseMove.confirmMove')"- :disabled="method.confirmMoveBtnDisabled(row)"+ :disabled="!data.authorityList.includes('confirm') || method.confirmMoveBtnDisabled(row)"@click="method.confirmMove(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"- :disabled="method.confirmMoveBtnDisabled(row)"+ :icon-color="!data.authorityList.includes('delete') || method.confirmMoveBtnDisabled(row)?'':errorColor"+ :disabled="!data.authorityList.includes('delete') || method.confirmMoveBtnDisabled(row)"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -143,7 +152,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { computed, ref, reactive, onActivated, watch, nextTick, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { WarehouseMoveVO, MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'@@ -152,15 +161,15 @@ import { hookComponent } from '@/components/system'import { deleteStockMove, getStockMoveList, getStockMoveOne, confirmMove } from '@/api/wms/warehouseMove'import { PROCESS_JOB_COMBINE } from '@/constant/warehouseWorking'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { formatMoveStatus } from '@/utils/format/formatWarehouseWorking'-import { formatDate } from '@/utils/format/formatSystem'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-move.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -192,6 +201,7 @@ const data = reactive({spu_name: '',sku_code: '',sku_name: '',+ series_number: '',creator: '',create_time: ''},@@ -200,7 +210,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -225,6 +238,7 @@ const method = reactive({spu_name: '',sku_code: '',sku_name: '',+ series_number: '',creator: '',create_time: ''}@@ -359,6 +373,29 @@ onActivated(() => {method.refresh()})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({ hasTab: false }))const tableHeight = computed(() => computedTableHeight({ hasTab: false }))diff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vueindex 5690637..219a09f 100644--- a/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue@@ -49,6 +49,7 @@<vxe-column field="spu_code" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_code')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.warehouseWorking.warehouseProcessing.sku_code')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-columnfield="qty":title="$t('wms.warehouseWorking.warehouseProcessing.qty')"@@ -172,7 +173,10 @@ const jobTypeComp = computed(() => (data.form.job_type === PROCESS_JOB_COMBINE? i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_combine'): i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_split')))const operateDisabled = computed(() => !!isUpdate.value)-const qrCodeValue = computed(() => data.form.id.toString())+const qrCodeValue = computed(() => JSON.stringify({+ id: data.form.id.toString(),+ type: 'warehouseProcessing'+ }))const method = reactive({initForm: () => {@@ -261,6 +265,7 @@ const method = reactive({spu_code: record.spu_code,spu_name: record.spu_name,sku_code: record.sku_code,+ series_number: record.series_number,unit: record.unit,is_update_stock: false,qty_available: record.qty_available@@ -286,6 +291,7 @@ const method = reactive({spu_code: selectRecords[0].spu_code,spu_name: selectRecords[0].spu_name,sku_code: selectRecords[0].sku_code,+ series_number: selectRecords[0].series_number,unit: selectRecords[0].unit,is_update_stock: false,qty_available: selectRecords[0].qty_availablediff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vueindex 952fd6c..ebb7560 100644--- a/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue@@ -11,7 +11,7 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn+ <!-- <tooltip-btnicon="mdi-arrow-split-vertical":tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.process_split')"@click="method.add(PROCESS_JOB_SPLIT)"@@ -22,7 +22,9 @@@click="method.add(PROCESS_JOB_COMBINE)"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -72,13 +74,20 @@</template></vxe-column><vxe-column field="processor" :title="$t('wms.warehouseWorking.warehouseProcessing.processor')"></vxe-column>- <vxe-column field="process_time" width="170px" :title="$t('wms.warehouseWorking.warehouseProcessing.process_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column+ field="process_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseProcessing.process_time')"+ ></vxe-column><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseProcessing.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseProcessing.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseProcessing.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -91,22 +100,22 @@:flat="true"icon="mdi-book-check-outline":tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmProcess')"- :disabled="method.confirmProcessBtnDisabled(row)"+ :disabled="!data.authorityList.includes('confirmOpeartion') || method.confirmProcessBtnDisabled(row)"@click="method.confirmProcess(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-book-open-outline":tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmAdjust')"- :disabled="method.confirmAdjustBtnDisabled(row)"+ :disabled="!data.authorityList.includes('confirmAdjust') || method.confirmAdjustBtnDisabled(row)"@click="method.confirmAdjust(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"- :disabled="method.confirmProcessBtnDisabled(row)"+ :icon-color="!data.authorityList.includes('delete') || method.confirmProcessBtnDisabled(row)?'':errorColor"+ :disabled="!data.authorityList.includes('delete') || method.confirmProcessBtnDisabled(row)"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -139,7 +148,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { computed, ref, reactive, onActivated, watch, nextTick, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'@@ -148,15 +157,16 @@ import { hookComponent } from '@/components/system'import { deleteStockProcess, getStockProcessList, getStockProcessOne, confirmAdjustment, confirmProcess } from '@/api/wms/warehouseProcessing'import { PROCESS_JOB_COMBINE, PROCESS_JOB_SPLIT } from '@/constant/warehouseWorking'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { formatIsValid, formatDate } from '@/utils/format/formatSystem'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import { formatIsValid } from '@/utils/format/formatSystem'import { formatProcessJobType } from '@/utils/format/formatWarehouseWorking'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-process.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -187,7 +197,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -366,6 +379,39 @@ onActivated(() => {method.refresh()})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_split'),+ icon: 'mdi-arrow-split-vertical',+ code: 'split',+ click: () => {+ method.add(PROCESS_JOB_SPLIT)+ }+ },+ {+ name: i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_combine'),+ icon: 'mdi-group',+ code: 'group',+ click: () => {+ method.add(PROCESS_JOB_COMBINE)+ }+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({ hasTab: false }))const tableHeight = computed(() => computedTableHeight({ hasTab: false }))diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vueindex 6a93977..d313ba4 100644--- a/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue+++ b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue@@ -55,6 +55,7 @@variant="outlined"disabled></v-text-field>+ <v-text-field v-model="data.form.series_number" :label="$t('wms.stockLocation.series_number')" variant="outlined" disabled></v-text-field><v-text-fieldv-model="data.form.warehouse_name":label="$t('wms.warehouseWorking.warehouseTaking.warehouse')"@@ -116,7 +117,10 @@ const emit = defineEmits(['close', 'saveSuccess'])const isUpdate = computed(() => props.form.id && props.form.id > 0)const operateDisabled = computed(() => !!isUpdate.value)const isFromStock = computed(() => data.curStockID > 0)-const qrCodeValue = computed(() => data.form.id.toString())+const qrCodeValue = computed(() => JSON.stringify({+ id: data.form.id.toString(),+ type: 'warehouseTaking'+ }))const props = defineProps<{showDialog: boolean@@ -146,6 +150,7 @@ const data = reactive({spu_code: '',spu_name: '',sku_code: '',+ series_number: '',warehouse_name: '',location_name: '',handler: '',@@ -198,6 +203,7 @@ const method = reactive({data.form.spu_code = selectRecords[0].spu_codedata.form.spu_name = selectRecords[0].spu_namedata.form.sku_code = selectRecords[0].sku_code+ data.form.series_number = selectRecords[0].series_numberdata.form.book_qty = selectRecords[0].qty_available} catch (error) {// console.error(error)diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vueindex 81068b7..e4960a3 100644--- a/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue+++ b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue@@ -66,7 +66,8 @@ const data = reactive({location_name: '',adjust_status: false,handler: '',- handle_time: ''+ handle_time: '',+ series_number: ''}),rules: {book_qty: [diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vueindex 0508234..32a0877 100644--- a/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue+++ b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue@@ -11,9 +11,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -60,19 +62,27 @@<vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')"></vxe-column><vxe-column field="spu_name" width="150px" :title="$t('base.commodityManagement.spu_name')"></vxe-column><vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column>+ <vxe-column field="series_number" width="150px" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="warehouse_name" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.warehouse')"></vxe-column><vxe-column field="location_name" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.location_name')"></vxe-column><vxe-column field="book_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.book_qty')"></vxe-column><vxe-column field="counted_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.counted_qty')"></vxe-column><vxe-column field="difference_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.difference_qty')"></vxe-column><vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.handler')"></vxe-column>- <vxe-column field="handle_time" width="170px" :title="$t('wms.warehouseWorking.warehouseTaking.handle_time')">- <template #default="{ row, column }">- <span>{{ formatDate(row[column.property]) }}</span>- </template>+ <vxe-column+ field="handle_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseTaking.handle_time')"+ ></vxe-column><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseTaking.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :title="$t('wms.warehouseWorking.warehouseTaking.create_time')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ :title="$t('wms.warehouseWorking.warehouseTaking.create_time')"+ ></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -85,22 +95,22 @@:flat="true"icon="mdi-book-check-outline":tooltip-text="$t('wms.warehouseWorking.warehouseTaking.confirmTaking')"- :disabled="method.isConfirmTaking(row)"+ :disabled="!data.authorityList.includes('confirmOpeartion') || method.isConfirmTaking(row)"@click="method.confirmTaking(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-book-open-outline":tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmAdjust')"- :disabled="method.confirmAdjustBtnDisabled(row)"+ :disabled="!data.authorityList.includes('confirmAdjust') || method.confirmAdjustBtnDisabled(row)"@click="method.confirmAdjust(row)"></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"- :disabled="method.isConfirmTaking(row)"+ :icon-color="!data.authorityList.includes('delete') || method.isConfirmTaking(row)?'':errorColor"+ :disabled="!data.authorityList.includes('delete') || method.isConfirmTaking(row)"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -133,7 +143,7 @@</template><script lang="ts" setup>-import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { computed, ref, reactive, onActivated, watch, nextTick, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'@@ -142,16 +152,16 @@ import { hookComponent } from '@/components/system'import { TAKING_JOB_FINISH, TAKING_JOB_UNFINISH } from '@/constant/warehouseWorking'import { deleteStockTaking, getStockTakingList, getStockTakingOne, confirmAdjustment } from '@/api/wms/warehouseTaking'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { formatTakingJobStatus } from '@/utils/format/formatWarehouseWorking'-import { formatDate } from '@/utils/format/formatSystem'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-taking.vue'import numberInput from './number-input.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTable = ref()@@ -174,6 +184,7 @@ const data = reactive({spu_code: '',spu_name: '',sku_code: '',+ series_number: '',warehouse_name: '',location_name: '',handler: '',@@ -190,7 +201,10 @@ const data = reactive({pageIndex: 1,pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])- })+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -209,6 +223,7 @@ const method = reactive({spu_code: '',spu_name: '',sku_code: '',+ series_number: '',warehouse_name: '',location_name: '',handler: '',@@ -369,6 +384,29 @@ onActivated(() => {method.refresh()})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({ hasTab: false }))const tableHeight = computed(() => computedTableHeight({ hasTab: false }))diff --git a/frontend/src/view/wms/stockAsn/add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/add-or-update-notice.vueindex 9c1262d..73321ec 100644--- a/frontend/src/view/wms/stockAsn/add-or-update-notice.vue+++ b/frontend/src/view/wms/stockAsn/add-or-update-notice.vue@@ -73,7 +73,11 @@</v-card></template></v-dialog>- <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ <sku-select+ :show-dialog="data.showSkuDialogSelect"+ @close="method.closeDialogSelect('target')"+ @sureSelect="method.sureSelect"+ /></template><script lang="ts" setup>@@ -115,22 +119,15 @@ const data = reactive({sku_code: '',sku_name: '',origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,weight: 0,volume: 0,supplier_id: 0,supplier_name: '',goods_owner_id: 0,goods_owner_name: '',- is_valid: true+ is_valid: true,+ detailList: []}),rules: {supplier_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.supplier_name') }!`],diff --git a/frontend/src/view/wms/stockAsn/add-sorting.vue b/frontend/src/view/wms/stockAsn/add-sorting.vuenew file mode 100644index 0000000..45f9577--- /dev/null+++ b/frontend/src/view/wms/stockAsn/add-sorting.vue@@ -0,0 +1,168 @@+<template>+ <v-dialog v-model="data.showDialog" :width="'50%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.sorted_qty"+ :label="$t('wms.stockAsnInfo.sorted_qty')"+ :rules="data.rules.sorted_qty"+ variant="outlined"+ ></v-text-field>+ <v-row v-for="(snNum, index) of data.SNList" :key="index" style="margin-top: 5px">+ <v-col :cols="10">+ <v-text-field+ v-model="snNum.snNum"+ :label="$t('wms.stockAsnInfo.series_number')"+ :rules="data.rules.series_number"+ variant="outlined"+ ></v-text-field>+ </v-col>+ <!-- <v-col :cols="3">+ <v-text-field v-model="data.staticDetailQty" readonly :label="$t('wms.stockAsnInfo.sorted_qty')" variant="outlined"></v-text-field>+ </v-col> -->+ <v-col :cols="2">+ <div class="detailBtnContainer">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.removeItem(index)"+ ></tooltip-btn>+ </div>+ </v-col>+ </v-row>+ <v-btn+ style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right"+ color="primary"+ :width="40"+ @click="method.insertSNData()"+ >+ ++ </v-btn>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, ref } from 'vue'+import { SortingVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { IsInteger, StringLength } from '@/utils/dataVerification/formRule'+import { errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'++const formRef = ref()+const emit = defineEmits(['sure'])++const data = reactive({+ showDialog: false,+ staticDetailQty: 1,+ form: ref<SortingVo>({+ asn_id: 0,+ sorted_qty: 0+ }),+ SNList: [] as { snNum: string }[],+ rules: {+ sorted_qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.sorted_qty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ],+ series_number: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.series_number') }!`,+ (val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)+ ]+ }+})++const method = reactive({+ // Delete data+ removeItem: (index: number) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ data.SNList.splice(index, 1)+ }+ })+ },+ insertSNData: () => {+ data.SNList.push({ snNum: '' })+ },+ openDialog: async (id: number) => {+ data.form = {+ asn_id: id,+ sorted_qty: 0+ }++ data.SNList = []++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ submit: async () => {+ if (data.SNList.length > data.form.sorted_qty) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.exceedingPrompt')+ })+ return+ }+ const { valid } = await formRef.value.validate()+ if (valid) {+ const reqData: any = []++ for (const item of data.SNList) {+ reqData.push({+ asn_id: data.form.asn_id,+ series_number: item.snNum,+ sorted_qty: 1+ })+ }++ // If there is still remaining after removing the SN code, add details without the SN code+ if (data.SNList.length !== data.form.sorted_qty) {+ const margin = data.form.sorted_qty - data.SNList.length+ reqData.push({+ asn_id: data.form.asn_id,+ series_number: '',+ sorted_qty: margin+ })+ }++ emit('sure', reqData)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.detailBtnContainer {+ height: 56px;+ display: flex;+ justify-content: center;+ align-items: center;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/confirm-arrival.vue b/frontend/src/view/wms/stockAsn/confirm-arrival.vuenew file mode 100644index 0000000..997a3ea--- /dev/null+++ b/frontend/src/view/wms/stockAsn/confirm-arrival.vue@@ -0,0 +1,58 @@+<template>+ <v-dialog v-model="data.showDialog" :width="'50%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.stockAsnInfo.arrival_time')}`"></v-toolbar>+ <v-card-text>+ <v-text-field v-model="data.arrival_time" type="date" variant="outlined" :label="$t('wms.stockAsnInfo.arrival_time')"></v-text-field>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { formatDate } from '@/utils/format/formatSystem'++const emit = defineEmits(['sure'])++const data = reactive({+ showDialog: false,+ arrival_time: ''+})++const method = reactive({+ openDialog: () => {+ data.arrival_time = formatDate(new Date(), 'yyyy-MM-dd')++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ submit: async () => {+ if (data.arrival_time) {+ emit('sure', data.arrival_time)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.mustInputErrorMsg')+ })+ }+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/wms/stockAsn/confirm-grouding.vue b/frontend/src/view/wms/stockAsn/confirm-grouding.vuenew file mode 100644index 0000000..056cd22--- /dev/null+++ b/frontend/src/view/wms/stockAsn/confirm-grouding.vue@@ -0,0 +1,203 @@+<template>+ <v-dialog v-model="data.showDialog" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stockAsnInfo.editGrounding')}`"></v-toolbar>+ <v-card-text>+ <v-row no-gutters>+ <v-col cols="12" class="col">+ <tooltip-btn+ icon="mdi-warehouse"+ :tooltip-text="$t('wms.stockAsnInfo.selectLocation')"+ @click="method.handleSelectLocation()"+ ></tooltip-btn>+ </v-col>+ </v-row>++ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ :edit-rules="data.validRules"+ :edit-config="{ trigger: 'click', mode: 'cell', activeMethod: method.activeMethod }"+ :mouse-config="{ selected: true }"+ :keyboard-config="{ isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true }"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column type="checkbox" width="50"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"> </vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockAsnInfo.series_number')"> </vxe-column>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ </vxe-column>++ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.can_putaway_qty')"> </vxe-column>+ <vxe-column field="putaway_qty" :title="$t('wms.stockAsnInfo.putaway_qty')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.putaway_qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ <!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="100" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-warehouse"+ :tooltip-text="$t('base.warehouseSetting.location_name')"+ @click="method.handleSelectLocation(row)"+ ></tooltip-btn>+ </template>+ </vxe-column> -->+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <locationSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect()" @sureSelect="method.sureSelect" />+</template>++<script lang="ts" setup>+import { reactive, ref } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT } from '@/constant/style'+import { getGrouding } from '@/api/wms/stockAsn'+import { isInteger } from '@/utils/dataVerification/tableRule'+import tooltipBtn from '@/components/tooltip-btn.vue'+import locationSelect from '@/components/select/location-select.vue'++const xTable = ref()++const emit = defineEmits(['sure'])++// Verify if it exceeds the available shelving quantity+const validQty = ({ cellValue, row }: { cellValue: number; row: { sorted_qty: number } }) => {+ if (!Number.isNaN(cellValue) && !Number.isNaN(row.sorted_qty) && cellValue > row.sorted_qty) {+ return new Error(i18n.global.t('wms.stockAsnInfo.exceedTip'))+ }+}++// If the number of listings is greater than 0, a storage location code must be selected for verification+const validLocationName = ({ cellValue, row }: { cellValue: string; row: { putaway_qty: number } }) => {+ if (row.putaway_qty && !cellValue) {+ return new Error(i18n.global.t('wms.stockAsnInfo.notLocation'))+ }+}++const data = reactive({+ showDialog: false,+ showSkuDialogSelect: false,+ tableData: [],+ validRules: {+ putaway_qty: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.putaway_qty') }` },+ {+ validator: isInteger,+ validNumerical: 'nonNegative',+ trigger: 'change'+ },+ { validator: validQty, trigger: 'change' }+ ],+ series_number: [],+ location_name: [{ validator: validLocationName, trigger: 'change' }]+ } as any+})++const method = reactive({+ // Table activation rules+ activeMethod: ({ column }: any) => {+ if (column.field === 'location_name') {+ return false+ }+ return true+ },+ // Select storage location+ handleSelectLocation: () => {+ const checkRecords = xTable.value.getCheckboxRecords()++ if (checkRecords.length > 0) {+ data.showSkuDialogSelect = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.selectOne')+ })+ }+ },+ // Close the location selection box+ closeDialogSelect: () => {+ data.showSkuDialogSelect = false+ },+ // Select inventory location callback+ sureSelect: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ const checkRecords = xTable.value.getCheckboxRecords()++ for (const item of checkRecords) {+ item.goods_location_id = selectRecords[0].id+ item.location_name = selectRecords[0].location_name+ }+ }+ },+ // Initialize window data+ initDialogData: async (id: number) => {+ const { data: res } = await getGrouding(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ data.showDialog = false+ return+ }+ data.tableData = res.data.map((item: any) => ({+ ...item,+ putaway_qty: item.sorted_qty+ }))+ },++ openDialog: async (id: number) => {+ // Initialized Data+ method.initDialogData(id)++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ submit: async () => {+ const $table = xTable.value+ const errMap = await $table.validate(true)+ if (!errMap) {+ emit('sure', data.tableData)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.col {+ display: flex;+ align-items: center;+ margin-bottom: 10px;+}+</style>diff --git a/frontend/src/view/wms/stockAsn/confirm-unload.vue b/frontend/src/view/wms/stockAsn/confirm-unload.vuenew file mode 100644index 0000000..8b6f59d--- /dev/null+++ b/frontend/src/view/wms/stockAsn/confirm-unload.vue@@ -0,0 +1,95 @@+<template>+ <v-dialog v-model="data.showDialog" :width="'50%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.stockAsnInfo.unloadTime')}`"></v-toolbar>+ <v-card-text>+ <v-text-field+ v-model="data.unloadPerson"+ variant="outlined"+ :label="$t('wms.stockAsnInfo.unloadPerson')"+ append-inner-icon="mdi-magnify"+ single-line+ readonly+ @click:append-inner="method.handleSelectPerson"+ ></v-text-field>+ <v-text-field v-model="data.unloadTime" type="date" variant="outlined" :label="$t('wms.stockAsnInfo.unloadTime')"></v-text-field>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <EmployeeSelect ref="EmployeeSelectRef" @sure-select="method.employeeSureBack" />+</template>++<script lang="ts" setup>+import { reactive, ref } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { formatDate } from '@/utils/format/formatSystem'+import EmployeeSelect from '@/components/select/employee-select.vue'+import { UserVO } from '@/types/Base/UserManagement'+import { store } from '@/store'++const emit = defineEmits(['sure'])+const EmployeeSelectRef = ref()++const data = reactive({+ showDialog: false,+ unloadTime: '',+ unloadPerson: '',+ unloadPersonID: 0+})++const method = reactive({+ handleSelectPerson: () => {+ EmployeeSelectRef.value.openDialog()+ },+ employeeSureBack: (list: UserVO[]) => {+ if (list.length > 0) {+ data.unloadPerson = list[0].user_name+ data.unloadPersonID = list[0].id++ EmployeeSelectRef.value.closeDialog()+ }+ },+ openDialog: () => {+ data.unloadTime = formatDate(new Date(), 'yyyy-MM-dd')++ const userInfo = store.getters['user/userInfo']++ data.unloadPerson = userInfo.user_name+ data.unloadPersonID = userInfo.user_id++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ submit: async () => {+ if (data.unloadTime) {+ emit('sure', {+ unloadTime: data.unloadTime,+ unloadPerson: data.unloadPerson,+ unloadPersonID: data.unloadPersonID+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.mustInputErrorMsg')+ })+ }+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vuenew file mode 100644index 0000000..24024c0--- /dev/null+++ b/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue@@ -0,0 +1,426 @@+<template>+ <v-dialog v-model="isShow" :width="'80%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-row>+ <v-col :cols="4">+ <!-- <v-select+ v-model="data.form.goods_owner_name"+ :items="data.combobox.goods_owner_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.goods_owner_name"+ :label="$t('wms.stockAsnInfo.goods_owner_name')"+ variant="outlined"+ clearable+ filterable+ @update:model-value="method.goodsOwnerNameChange"+ ></v-select> -->+ <customFilterSelect+ v-model="data.form"+ :items="data.combobox.goods_owner_name"+ item-title="label"+ :rules="data.rules.goods_owner_name"+ :label="$t('wms.stockAsnInfo.goods_owner_name')"+ :mapping="[+ {+ in: 'goods_owner_id',+ out: 'value'+ },+ {+ in: 'goods_owner_name',+ out: 'label'+ }+ ]"+ />+ </v-col>+ <v-col :cols="4">+ <v-text-field+ v-model="data.form.asn_batch"+ :label="$t('wms.stockAsnInfo.asn_batch')"+ :rules="data.rules.asn_batch"+ variant="outlined"+ ></v-text-field>+ </v-col>+ <v-col :cols="4">+ <v-text-field+ v-model="data.form.estimated_arrival_time"+ type="date"+ variant="outlined"+ :label="$t('wms.stockAsnInfo.estimated_arrival_time')"+ ></v-text-field>+ </v-col>+ </v-row>++ <v-row v-for="(item, index) of data.form.detailList" :key="index" style="margin-top: 5px">+ <v-col :cols="11">+ <v-row>+ <v-col :cols="3">+ <v-text-field v-model="item.spu_name" :label="$t('wms.stockAsnInfo.spu_name')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="2">+ <v-text-field+ v-model="item.spu_code"+ :label="$t('wms.stockAsnInfo.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ ></v-text-field>+ </v-col>+ <v-col :cols="2">+ <v-text-field v-model="item.sku_code" :label="$t('wms.stockAsnInfo.sku_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="3">+ <!-- <v-select+ v-model="item.supplier_name"+ :items="data.combobox.supplier_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.supplier_name"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="outlined"+ clearable+ @update:model-value="method.supplierNameChange(item)"+ ></v-select> -->+ <customFilterSelect+ v-model="data.form.detailList[index]"+ :items="data.combobox.supplier_name"+ item-title="label"+ :rules="data.rules.supplier_name"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ :mapping="[+ {+ in: 'supplier_name',+ out: 'label'+ },+ {+ in: 'supplier_id',+ out: 'value'+ }+ ]"+ />+ </v-col>+ <v-col :cols="2">+ <v-text-field+ v-model="item.asn_qty"+ :rules="data.rules.asn_qty"+ :label="$t('wms.stockAsnInfo.asn_qty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ </v-row>+ </v-col>+ <v-col :cols="1">+ <div class="detailBtnContainer">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.removeItem(index, item)"+ ></tooltip-btn>+ </div>+ </v-col>+ </v-row>+ <!-- <v-btn style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right" color="primary" :width="40" @click="method.AddDetail">+ ++ </v-btn> -->+ <v-btn+ style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right"+ color="primary"+ :width="40"+ @click="method.openSelect('target')"+ >+ ++ </v-btn>+ </v-form>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ <skuSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { errorColor } from '@/constant/style'+import { hookComponent } from '@/components/system/index'+import { addAsnNew, updateAsnNew } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import skuSelect from '@/components/select/sku-select.vue'+import { CommodityDetailJoinMainVO } from '@/types/Base/CommodityManagement'+import { IsInteger, StringLength } from '@/utils/dataVerification/formRule'+import { StockAsnVO, StockAsnDetailVO } from '@/types/WMS/StockAsn'+import { getSupplierAll } from '@/api/base/supplier'+import { getOwnerOfCargoAll } from '@/api/base/ownerOfCargo'+import { checkDetailRepeatGetBool } from '@/utils/dataVerification/page'+import { formatDate } from '@/utils/format/formatSystem'+import customFilterSelect from '@/components/custom-filter-select.vue'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: StockAsnVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ curSelectType: '',+ showSkuDialogSelect: false,+ dialogTitle: '',+ form: ref<StockAsnVO>({+ id: 0,+ asn_no: '',+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []+ }),+ removeDetailList: ref<StockAsnDetailVO[]>([]),+ combobox: ref<{+ supplier_name: {+ label: string+ value: number+ }[]+ goods_owner_name: {+ label: string+ value: number+ }[]+ }>({+ supplier_name: [],+ goods_owner_name: []+ }),+ rules: {+ goods_owner_name: [],+ estimated_arrival_time: [],+ supplier_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.supplier_name') }!`],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.sku_code') }!`],+ asn_qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.asn_qty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ],+ asn_batch: [+ // (val: string) => !!val || `${i18n.global.t('system.checkText.mustInput')}${i18n.global.t('wms.stockAsnInfo.asn_batch')}!`,+ (val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)+ ]+ }+})++const method = reactive({+ supplierNameChange: (dItem: StockAsnDetailVO) => {+ if (dItem.supplier_name) {+ dItem.supplier_id = data.combobox.supplier_name.filter((item) => item.label === dItem.supplier_name)[0].value+ } else {+ dItem.supplier_id = 0+ }+ },+ goodsOwnerNameChange: (val: string) => {+ if (!val) {+ data.form.goods_owner_id = 0+ data.form.goods_owner_name = ''+ } else {+ data.form.goods_owner_id = data.combobox.goods_owner_name.filter((item) => item.label === val)[0].value+ }+ },+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ sureSelect: (selectRecords: CommodityDetailJoinMainVO[]) => {+ if (data.curSelectType === 'target') {+ // 获取最后一条有供应商的数据, 自动带到后面的数据+ let hasSupplierItem: any = null++ for (const item of data.form.detailList.reverse()) {+ if (item.supplier_id && item.supplier_id > 0) {+ hasSupplierItem = item+ break+ }+ }++ for (const item of selectRecords) {+ // const index = data.form.detailList.findIndex((fi) => fi.sku_id === item.sku_id)+ // if (index === -1) {+ const newItem: any = {+ spu_id: item.spu_id,+ spu_code: item.spu_code,+ spu_name: item.spu_name,+ sku_id: item.sku_id,+ sku_code: item.sku_code,+ sku_name: item.sku_name,+ origin: item.origin,+ // length_unit: '',+ // volume_unit: '',+ // weight_unit: '',+ asn_qty: 0+ // actual_qty: '',+ // weight: '',+ // volume: '',+ // supplier_id: '',+ // supplier_name: ''+ // is_valid: ''+ }++ if (hasSupplierItem) {+ newItem.supplier_id = hasSupplierItem.supplier_id+ newItem.supplier_name = hasSupplierItem.supplier_name+ }++ data.form.detailList.push(newItem)+ // }+ }+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ data.showSkuDialogSelect = false+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.supplier_name = []+ data.combobox.goods_owner_name = []+ const { data: supplierRes } = await getSupplierAll()+ if (!supplierRes.isSuccess) {+ return+ }+ for (const item of supplierRes.data) {+ if (item.is_valid) {+ data.combobox.supplier_name.push({+ label: item.supplier_name,+ value: item.id+ })+ }+ }+ const { data: goodsOwnerRes } = await getOwnerOfCargoAll()+ if (!goodsOwnerRes.isSuccess) {+ return+ }+ for (const item of goodsOwnerRes.data) {+ if (item.is_valid) {+ data.combobox.goods_owner_name.push({+ label: item.goods_owner_name,+ value: item.id+ })+ }+ }+ },+ closeDialog: () => {+ emit('close')+ },+ // Details verification before document submission+ beforeSubmit: (): boolean => {+ let flag = true+ if (data.form.detailList.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ flag = false+ } else if (checkDetailRepeatGetBool(data.form.detailList, ['sku_id', 'supplier_id'])) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailHasItemRepeat')+ })+ flag = false+ }+ return flag+ },+ submit: async () => {+ const beforeSubmitFlag = method.beforeSubmit()+ if (!beforeSubmitFlag) {+ return+ }+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = data.form.id && data.form.id > 0+ ? await updateAsnNew({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] })+ : await addAsnNew(data.form)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },+ // remove detail+ removeItem: (index: number, item: StockAsnDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (item.id && item.id > 0) {+ item.id = -item.id+ data.removeDetailList.push(item) // Cache remove row+ }+ data.form.detailList.splice(index, 1) // Remove row in detailList+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form++ // Processing time is date+ if (data.form.estimated_arrival_time) {+ data.form.estimated_arrival_time = formatDate(data.form.estimated_arrival_time, 'yyyy-MM-dd')+ }+ }+ }+)+</script>++<style scoped lang="less">+// .v-form {+// div {+// margin-bottom: 7px;+// }+// }+.detailBtnContainer {+ height: 56px;+ display: flex;+ justify-content: center;+ align-items: center;+}+// .v-col {+// padding: 0 !important;+// }+</style>diff --git a/frontend/src/view/wms/stockAsn/qrCodeDialog.vue b/frontend/src/view/wms/stockAsn/qrCodeDialog.vuenew file mode 100644index 0000000..dfea49a--- /dev/null+++ b/frontend/src/view/wms/stockAsn/qrCodeDialog.vue@@ -0,0 +1,104 @@+<template>+ <v-dialog v-model="data.showDialog" width="448px" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-card-text>+ <div id="printArea" class="printArea">+ <div class="printTopContainer">+ <div>+ <vue-qr :key="data.printText" size="140" :margin="0" :auto-color="true" :dot-scale="1" :text="data.printText"></vue-qr>+ </div>++ <div class="printLabel" style="flex: 1">+ <div>+ <span class="labelTitle">{{ $t('wms.stockAsnInfo.num') }}:</span> {{ data.printData.asn_no }}+ </div>+ <div><span class="labelTitle">{{ $t('wms.stockAsnInfo.asn_batch') }}:</span> {{ data.printData.asn_batch }}</div>+ </div>+ </div>+ </div>+ </v-card-text>++ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" variant="text">{{ $t('system.page.print') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script setup lang="tsx">+import { reactive } from 'vue'+import VueQr from 'vue-qr/src/packages/vue-qr.vue'++const data = reactive({+ showDialog: false,+ printData: {+ asn_id: 0,+ asn_no: '',+ asn_batch: ''+ } as any,+ printText: ''+})++const method = reactive({+ openDialog: (row: any) => {+ data.printData = row++ data.printText = JSON.stringify({+ asn_id: row.asn_id,+ type: row.type+ })++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.printArea {+ width: 400px;++ display: flex;+ flex-wrap: wrap;+ align-items: center;+ justify-content: center;++ box-sizing: border-box;+ padding: 10px;++ .printTopContainer {+ display: flex;+ justify-content: space-between;+ }+}+.printLabel {+ font-size: 14px;+ font-weight: bold;++ display: flex;+ flex-wrap: wrap;+ align-items: center;++ box-sizing: border-box;+ padding-left: 30px;++ .labelTitle {+ opacity: 0.7;+ font-weight: 600;+ }++ div {+ width: 100%;+ }+}+</style>diff --git a/frontend/src/view/wms/stockAsn/sku-info.vue b/frontend/src/view/wms/stockAsn/sku-info.vueindex 511dd5a..3a10ff0 100644--- a/frontend/src/view/wms/stockAsn/sku-info.vue+++ b/frontend/src/view/wms/stockAsn/sku-info.vue@@ -28,13 +28,12 @@</template><script lang="ts" setup>-import { reactive, computed, ref, watch } from 'vue'-import { StockAsnVO, SkuInfoVo } from '@/types/WMS/StockAsn'+import { reactive, computed, watch } from 'vue'+import { StockAsnVO } from '@/types/WMS/StockAsn'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { getSkuInfo } from '@/api/wms/stockAsn'-const formRef = ref()const emit = defineEmits(['close'])const props = defineProps<{@@ -45,7 +44,7 @@ const props = defineProps<{const isShow = computed(() => props.showDialog)const data = reactive({- form: ref<StockAsnVO>({+ form: {id: 0,asn_no: '',asn_status: 0,@@ -72,8 +71,8 @@ const data = reactive({goods_owner_id: 0,goods_owner_name: '',is_valid: true- }),- tableData: ref<SkuInfoVo>({+ } as any,+ tableData: {spu_id: 0,spu_code: '',spu_name: '',@@ -99,7 +98,7 @@ const data = reactive({unit: '',cost: 0,price: 0- })+ } as any})const method = reactive({diff --git a/frontend/src/view/wms/stockAsn/tabNotice.vue b/frontend/src/view/wms/stockAsn/tabNotice.vueindex 4e63e7d..d3757f1 100644--- a/frontend/src/view/wms/stockAsn/tabNotice.vue+++ b/frontend/src/view/wms/stockAsn/tabNotice.vue@@ -3,9 +3,12 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn>+ <!-- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add"></tooltip-btn><tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -48,34 +51,42 @@height: cardHeight}">- <vxe-table ref="xTableStockLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center"><template #empty>{{ i18n.global.t('system.page.noData') }}</template>+ <vxe-column type="checkbox" width="50" fixed="left"></vxe-column><vxe-column type="seq" width="60"></vxe-column>- <vxe-column type="checkbox" width="50"></vxe-column><vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column>- <vxe-column field="spu_code" :title="$t('wms.stockAsnInfo.spu_code')"></vxe-column>- <vxe-column field="spu_name" :title="$t('wms.stockAsnInfo.spu_name')"></vxe-column>- <vxe-column field="sku_code" :title="$t('wms.stockAsnInfo.sku_code')">- <template #default="{ row }">- <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>- </template>- </vxe-column>- <vxe-column field="sku_name" :title="$t('wms.stockAsnInfo.sku_name')"></vxe-column>+ <vxe-column field="asn_batch" :title="$t('wms.stockAsnInfo.asn_batch')"></vxe-column>+ <vxe-column+ field="estimated_arrival_time"+ :formatter="['formatDate', 'yyyy-MM-dd']"+ :title="$t('wms.stockAsnInfo.estimated_arrival_time')"+ ></vxe-column><vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column>- <vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column>- <vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>- <vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column>- <vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="140px" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-qrcode"+ :tooltip-text="$t('base.commodityManagement.printQrCode')"+ :disabled="!data.authorityList.includes('notice-printQrCode')"+ @click="method.printQrCode(row)"+ ></tooltip-btn> -->+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('system.page.edit')"+ :disabled="!data.authorityList.includes('notice-save')"+ @click="method.editRow(row)"+ ></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"+ :icon-color="!data.authorityList.includes('notice-delete') ? '' : errorColor"+ :disabled="!data.authorityList.includes('notice-delete')"@click="method.deleteRow(row)"></tooltip-btn></template>@@ -94,27 +105,39 @@</div><addOrUpdateNotice :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" /><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />++ <!-- Print QR code -->+ <qr-code-dialog ref="qrCodeDialogRef" :menu="'stockAsnInfo-notice'">+ <template #left="{ slotData }">+ <p>{{ $t('wms.stockAsnInfo.num') }}:{{ slotData.asn_no }}</p> + <p>{{ $t('wms.stockAsnInfo.asn_batch') }}:{{ slotData.asn_batch }}</p> + </template>+ </qr-code-dialog></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'import { StockAsnVO } from '@/types/WMS/StockAsn'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { getStockAsnList, deleteAsn } from '@/api/wms/stockAsn'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import { listNew as getStockAsnList, deleteAsn } from '@/api/wms/stockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'-import addOrUpdateNotice from './add-or-update-notice.vue'+import addOrUpdateNotice from './new-add-or-update-notice.vue'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'-const xTableStockLocation = ref()+const xTable = ref()+const qrCodeDialogRef = ref()const data = reactive({showDialog: false,@@ -126,30 +149,17 @@ const data = reactive({dialogForm: ref<StockAsnVO>({id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}),activeTab: null,tableData: ref<StockAsnVO[]>([]),@@ -160,10 +170,39 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList(),+ selectRowData: []})const method = reactive({+ // Print QR code+ printQrCode: () => {+ const records = xTable.value.getCheckboxRecords()++ // data.selectRowData.length === 0 ? data.selectRowData = [row] : ''+ // const records:any[] = data.selectRowData+ if (records.length > 0) {+ for (const item of records) {+ item.type = 'asn'+ }+ qrCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },+ selectAllEvent({ checked }) {+ const records = xTable.value.getCheckboxRecords()+ checked ? (data.selectRowData = records) : (data.selectRowData = [])+ },+ selectChangeEvent() {+ data.selectRowData = xTable.value.getCheckboxRecords()+ },closeDialogShowInfo: () => {data.showDialogShowInfo = false},@@ -176,30 +215,17 @@ const method = reactive({data.dialogForm = {id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}data.showDialog = true},@@ -214,6 +240,13 @@ const method = reactive({if (row.id) {const { data: res } = await deleteAsn(row.id)if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }+hookComponent.$message({type: 'error',content: res.errorMessage@@ -261,7 +294,7 @@ const method = reactive({method.getStockAsnList()}),exportTable: () => {- const $table = xTableStockLocation.value+ const $table = xTable.valueexportData({table: $table,filename: i18n.global.t('wms.stockAsn.tabNotice'),@@ -276,6 +309,35 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.add'),+ icon: 'mdi-plus',+ code: 'notice-save',+ click: method.add+ },+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'notice-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('base.commodityManagement.printQrCode'),+ icon: 'mdi-qrcode',+ code: 'notice-printQrCode',+ click: method.printQrCode+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockAsn/tabReceiptDetails.vue b/frontend/src/view/wms/stockAsn/tabReceiptDetails.vueindex 628c8ac..296ea12 100644--- a/frontend/src/view/wms/stockAsn/tabReceiptDetails.vue+++ b/frontend/src/view/wms/stockAsn/tabReceiptDetails.vue@@ -3,8 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -72,6 +75,11 @@<vxe-column field="shortage_qty" :title="$t('wms.stockAsnInfo.shortage_qty')"></vxe-column><vxe-column field="more_qty" :title="$t('wms.stockAsnInfo.more_qty')"></vxe-column><vxe-column field="damage_qty" :title="$t('wms.stockAsnInfo.damage_qty')"></vxe-column>+ <!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ </template>+ </vxe-column> --></vxe-table><custom-pager:current-page="data.tablePage.pageIndex"@@ -85,26 +93,31 @@</custom-pager></div><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />++ <!-- View Details Box -->+ <view-detail-dialog ref="ViewDetailDialogRef" /></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { computedCardHeight, computedTableHeight } from '@/constant/style'import { StockAsnVO } from '@/types/WMS/StockAsn'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { getStockAsnList } from '@/api/wms/stockAsn'-import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import ViewDetailDialog from './view-detail-dialog.vue'const xTableStockLocation = ref()+const ViewDetailDialogRef = ref()const data = reactive({showDialog: false,@@ -118,30 +131,17 @@ const data = reactive({dialogForm: ref<StockAsnVO>({id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}),tablePage: reactive({total: 0,@@ -150,10 +150,17 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({+ // View Rows+ viewRow: (row: StockAsnVO) => {+ ViewDetailDialogRef.value.openDialog(row.id)+ },closeDialogShowInfo: () => {data.showDialogShowInfo = false},@@ -199,6 +206,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'detail-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockAsn/tabToDoArrival.vue b/frontend/src/view/wms/stockAsn/tabToDoArrival.vueindex 542a9c2..d04f900 100644--- a/frontend/src/view/wms/stockAsn/tabToDoArrival.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoArrival.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -67,11 +69,17 @@<vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column><vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column><vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-check" :tooltip-text="$t('system.page.confirm')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-check"+ :tooltip-text="$t('system.page.confirm')"+ :disabled="!data.authorityList.includes('delivered-confirm')"+ @click="method.editRow(row)"+ ></tooltip-btn></template>- </vxe-column>+ </vxe-column> --></vxe-table><custom-pager:current-page="data.tablePage.pageIndex"@@ -85,26 +93,31 @@</custom-pager></div><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+ <!-- Confirm Arrival Box -->+ <confirm-arrival-modal ref="ConfirmArrivalRef" @sure="method.sureBackArrival" /></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { computedCardHeight, computedTableHeight } from '@/constant/style'import { StockAsnVO } from '@/types/WMS/StockAsn'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { getStockAsnList, confirmAsn } from '@/api/wms/stockAsn'-import tooltipBtn from '@/components/tooltip-btn.vue'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import { getStockAsnList, confirmAsn, confirmArrival } from '@/api/wms/stockAsn'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import ConfirmArrivalModal from './confirm-arrival.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTableStockLocation = ref()+const ConfirmArrivalRef = ref()const data = reactive({showDialog: false,@@ -118,30 +131,17 @@ const data = reactive({dialogForm: ref<StockAsnVO>({id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}),tablePage: reactive({total: 0,@@ -150,10 +150,53 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({+ // Open the confirmation of arrival box+ handleArrival: () => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ if (checkRecords.length > 0) {+ ConfirmArrivalRef.value.openDialog()+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.selectOne')+ })+ }+ },+ // Confirm arrival+ sureBackArrival: async (dateStr: string) => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ const reqBody = checkRecords.map((item: StockAsnVO) => ({ id: item.id, arrival_time: dateStr }))++ const { data: res } = await confirmArrival(reqBody)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()+ ConfirmArrivalRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.confirm') }${ i18n.global.t('system.tips.success') }`+ })+ ConfirmArrivalRef.value.closeDialog()+ method.refresh()+ },closeDialogShowInfo: () => {data.showDialogShowInfo = false},@@ -221,6 +264,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'delivered-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.stockAsnInfo.confirmArrival'),+ icon: 'mdi-check',+ code: 'delivered-confirm',+ click: method.handleArrival+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vueindex 00d4473..72ee983 100644--- a/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue@@ -3,8 +3,11 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -71,14 +74,21 @@<vxe-column field="actual_qty" :title="$t('wms.stockAsnInfo.actual_qty')"></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRow(row)"></tooltip-btn><tooltip-btn+ :flat="true"+ icon="mdi-package-up"+ :tooltip-text="$t('wms.stockAsnInfo.grounding')"+ :disabled="!data.authorityList.includes('putOnTheShelf-editArrival')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <!-- <tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')":icon-color="errorColor"+ :disabled="!data.authorityList.includes('putOnTheShelf-delete')"@click="method.deleteRow(row)"- ></tooltip-btn>+ ></tooltip-btn> --></template></vxe-column></vxe-table>@@ -94,28 +104,35 @@</custom-pager></div><updateGrounding :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />++ <!-- Listing operation box -->+ <confirmGroudingDialog ref="confirmGroudingDialogRef" @sure="method.confirmGroudingSure" /><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" /></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { computedCardHeight, computedTableHeight } from '@/constant/style'import { StockAsnVO } from '@/types/WMS/StockAsn'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { getStockAsnList, sortedAsnCancel } from '@/api/wms/stockAsn'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import { getStockAsnList, sortedAsnCancel, revokeSorting, confirmPutaway } from '@/api/wms/stockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import updateGrounding from './update-grounding.vue'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import confirmGroudingDialog from './confirm-grouding.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTableStockLocation = ref()+const confirmGroudingDialogRef = ref()const data = reactive({showDialog: false,@@ -128,30 +145,17 @@ const data = reactive({dialogForm: ref<StockAsnVO>({id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}),tableData: ref<StockAsnVO[]>([]),tablePage: reactive({@@ -161,10 +165,76 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({+ // Confirm listing data+ confirmGroudingSure: async (tableData: any) => {+ const { data: res } = await confirmPutaway(tableData)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()+ confirmGroudingDialogRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })++ confirmGroudingDialogRef.value.closeDialog()+ method.refresh()+ },+ // Withdrawal process+ handleRevoke: () => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ if (checkRecords.length > 0) {+ const idList = checkRecords.map((item: StockAsnVO) => item.id)+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeOperation'),+ handleConfirm: async () => {+ const { data: res } = await revokeSorting(idList)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.selectOne')+ })+ }+ },closeDialogShowInfo: () => {data.showDialogShowInfo = false},@@ -182,8 +252,10 @@ const method = reactive({method.closeDialog()},editRow(row: StockAsnVO) {- data.dialogForm = JSON.parse(JSON.stringify(row))- data.showDialog = true+ // data.dialogForm = JSON.parse(JSON.stringify(row))+ // data.showDialog = true++ confirmGroudingDialogRef.value.openDialog(row.id)},deleteRow(row: StockAsnVO) {hookComponent.$dialog({@@ -200,7 +272,7 @@ const method = reactive({}hookComponent.$message({type: 'success',- content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ content: `${ i18n.global.t('system.page.revoke') }${ i18n.global.t('system.tips.success') }`})method.refresh()}@@ -245,6 +317,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'putOnTheShelf-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.stockAsnInfo.revoke'),+ icon: 'mdi-arrow-left-top',+ code: 'putOnTheShelf-delete',+ click: method.handleRevoke+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockAsn/tabToDoSorting.vue b/frontend/src/view/wms/stockAsn/tabToDoSorting.vueindex ad770d0..91e71b8 100644--- a/frontend/src/view/wms/stockAsn/tabToDoSorting.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoSorting.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -70,15 +72,35 @@<vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="180" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-pencil-outline" :tooltip-text="$t('system.page.edit')" @click="method.editRowEdit(row)"></tooltip-btn>- <tooltip-btn :flat="true" icon="mdi-check" :tooltip-text="$t('system.page.confirm')" @click="method.editRow(row)"></tooltip-btn><tooltip-btn+ :flat="true"+ icon="mdi-plus"+ :tooltip-text="$t('wms.stockAsnInfo.addSorting')"+ :disabled="!data.authorityList.includes('sorted-editCount')"+ @click="method.addSorting(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-pencil-outline"+ :tooltip-text="$t('wms.stockAsnInfo.editSorting')"+ :disabled="!data.authorityList.includes('sorted-editCount')"+ @click="method.editRowEdit(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-check"+ :tooltip-text="$t('system.page.confirm')"+ :disabled="!data.authorityList.includes('sorted-confirm')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <!-- <tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')":icon-color="errorColor"+ :disabled="!data.authorityList.includes('sorted-delete')"@click="method.deleteRow(row)"- ></tooltip-btn>+ ></tooltip-btn> --></template></vxe-column></vxe-table>@@ -93,32 +115,37 @@></custom-pager></div>- <updateSorting :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <addSorting ref="addSortingRef" @sure="method.addSortingSure" />+ <updateSortingDialog ref="updateSortingDialogRef" @sure="method.updateSortingSure" /><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" /></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'-import { StockAsnVO } from '@/types/WMS/StockAsn'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { StockAsnVO, UpdateSortingVo } from '@/types/WMS/StockAsn'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { getStockAsnList, sortedAsn, unloadAsnCancel } from '@/api/wms/stockAsn'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import { editSorting, getStockAsnList, revokeUnload, confirmSorted, unloadAsnCancel, modifySorting } from '@/api/wms/stockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'-import updateSorting from './update-sorting.vue'+import addSorting from './add-sorting.vue'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import updateSortingDialog from './update-sorting.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTableStockLocation = ref()+const addSortingRef = ref()+const updateSortingDialogRef = ref()const data = reactive({- showDialog: false,showDialogShowInfo: false,searchForm: {supplier_name: '',@@ -128,30 +155,17 @@ const data = reactive({dialogForm: ref<StockAsnVO>({id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}),tableData: ref<StockAsnVO[]>([]),tablePage: reactive({@@ -161,10 +175,102 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({+ // Modify sorting information callback+ updateSortingSure: async (tableData: UpdateSortingVo[]) => {+ const { data: res } = await modifySorting(tableData)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()+ updateSortingDialogRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })++ updateSortingDialogRef.value.closeDialog()+ method.refresh()+ },+ // Withdrawal process+ handleRevoke: () => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ if (checkRecords.length > 0) {+ const idList = checkRecords.map((item: StockAsnVO) => item.id)+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeOperation'),+ handleConfirm: async () => {+ const { data: res } = await revokeUnload(idList)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.revoke') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.selectOne')+ })+ }+ },+ // Callback after modifying sorting information+ addSortingSure: async (reqData: { asn_id: number; series_number: string; sorted_qty: number }[]) => {+ const { data: res } = await editSorting(reqData)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()+ addSortingRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })++ addSortingRef.value.closeDialog()+ method.refresh()+ },closeDialogShowInfo: () => {data.showDialogShowInfo = false},@@ -172,26 +278,27 @@ const method = reactive({data.dialogForm = JSON.parse(JSON.stringify(row))data.showDialogShowInfo = true},- // Shut add or update dialog- closeDialog: () => {- data.showDialog = false- },- // After add or update success.- saveSuccess: () => {- method.refresh()- method.closeDialog()+ // Add sorting record+ addSorting: (row: StockAsnVO) => {+ addSortingRef.value.openDialog(row.id)},editRowEdit(row: StockAsnVO) {- data.dialogForm = JSON.parse(JSON.stringify(row))- data.showDialog = true+ updateSortingDialogRef.value.openDialog(row.id)},editRow(row: StockAsnVO) {hookComponent.$dialog({content: i18n.global.t('system.tips.beforeAsnSorted'),handleConfirm: async () => {if (row.id) {- const { data: res } = await sortedAsn(row.id)+ const { data: res } = await confirmSorted(row.id)if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }+hookComponent.$message({type: 'error',content: res.errorMessage@@ -267,6 +374,29 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'sorted-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.stockAsnInfo.revoke'),+ icon: 'mdi-arrow-left-top',+ code: 'sorted-delete',+ click: method.handleRevoke+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockAsn/tabToDoUnload.vue b/frontend/src/view/wms/stockAsn/tabToDoUnload.vueindex fb1590e..caffb2c 100644--- a/frontend/src/view/wms/stockAsn/tabToDoUnload.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoUnload.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->++ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -67,18 +69,25 @@<vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column><vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column><vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column>- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>+ <!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }">- <tooltip-btn :flat="true" icon="mdi-check" :tooltip-text="$t('system.page.confirm')" @click="method.editRow(row)"></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-check"+ :tooltip-text="$t('system.page.confirm')"+ :disabled="!data.authorityList.includes('unloaded-confirm')"+ @click="method.editRow(row)"+ ></tooltip-btn><tooltip-btn:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')":icon-color="errorColor"+ :disabled="!data.authorityList.includes('unloaded-delete')"@click="method.deleteRow(row)"></tooltip-btn></template>- </vxe-column>+ </vxe-column> --></vxe-table><custom-pager:current-page="data.tablePage.pageIndex"@@ -92,26 +101,31 @@</custom-pager></div><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+ <!-- Pending unloading confirmation box -->+ <ConfirmUnloadModal ref="ConfirmUnloadModalRef" @sure="method.sureBackUnloadConfirm" /></template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { computedCardHeight, computedTableHeight } from '@/constant/style'import { StockAsnVO } from '@/types/WMS/StockAsn'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'-import { getStockAsnList, unloadAsn, confirmAsnCancel } from '@/api/wms/stockAsn'-import tooltipBtn from '@/components/tooltip-btn.vue'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import { getStockAsnList, unloadAsn, confirmAsnCancel, confirmUnload, unconfirmArrival } from '@/api/wms/stockAsn'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'-import { exportData } from '@/utils/exportTable'+// import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import ConfirmUnloadModal from './confirm-unload.vue'+import { httpCodeJudge } from '@/utils/http/httpCodeJudge'const xTableStockLocation = ref()+const ConfirmUnloadModalRef = ref()const data = reactive({showDialog: false,@@ -125,30 +139,17 @@ const data = reactive({dialogForm: ref<StockAsnVO>({id: 0,asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true+ asn_batch: '',+ estimated_arrival_time: '',+ // asn_status: 0,+ // weight: 0,+ // volume: 0,+ // goods_owner_id: 0,+ // goods_owner_name: '',+ // creator: '',+ // create_time: '',+ // last_update_time: '',+ detailList: []}),tablePage: reactive({total: 0,@@ -157,10 +158,90 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({+ // Withdrawal process+ handleRevoke: () => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ if (checkRecords.length > 0) {+ const idList = checkRecords.map((item: StockAsnVO) => item.id)+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeOperation'),+ handleConfirm: async () => {+ const { data: res } = await unconfirmArrival(idList)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.revoke') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.selectOne')+ })+ }+ },+ // Open the arrival confirmation box+ handleConfirm: () => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ if (checkRecords.length > 0) {+ ConfirmUnloadModalRef.value.openDialog()+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.stockAsnInfo.selectOne')+ })+ }+ },+ // After confirmation+ sureBackUnloadConfirm: async (form: { unloadTime: string; unloadPerson: string; unloadPersonID: number }) => {+ const checkRecords = xTableStockLocation.value.getCheckboxRecords()+ const reqBody = checkRecords.map((item: StockAsnVO) => ({ id: item.id, ...form }))++ const { data: res } = await confirmUnload(reqBody)+ if (!res.isSuccess) {+ // 2023-12-06 Add automatic refresh of expired data+ if (httpCodeJudge(res.errorMessage)) {+ method.refresh()+ ConfirmUnloadModalRef.value.closeDialog()++ return+ }++ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.confirm') }${ i18n.global.t('system.tips.success') }`+ })+ ConfirmUnloadModalRef.value.closeDialog()+ method.refresh()+ },closeDialogShowInfo: () => {data.showDialogShowInfo = false},@@ -250,6 +331,35 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'unloaded-export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('wms.stockAsnInfo.confirmUnload'),+ icon: 'mdi-check',+ code: 'unloaded-confirm',+ click: method.handleConfirm+ },+ {+ name: i18n.global.t('wms.stockAsnInfo.revoke'),+ icon: 'mdi-arrow-left-top',+ code: 'unloaded-delete',+ click: method.handleRevoke+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockAsn/update-grounding.vue b/frontend/src/view/wms/stockAsn/update-grounding.vueindex fb233d3..32a2753 100644--- a/frontend/src/view/wms/stockAsn/update-grounding.vue+++ b/frontend/src/view/wms/stockAsn/update-grounding.vue@@ -1,18 +1,18 @@<template>- <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <v-dialog v-model="data.showDialog" :width="'30%'" transition="dialog-top-transition" :persistent="true"><template #default><v-card><v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar><v-card-text><v-form ref="formRef">- <v-text-field+ <!-- <v-text-fieldv-model="data.formPutaway.location_name":label="$t('base.warehouseSetting.location_name')":rules="data.rules.location_name"variant="outlined"readonlyclearable- @click="method.openSelect('target')"+ @click="method.openSelect(index)"@click:clear="method.clearCommodity"></v-text-field><v-text-field@@ -20,7 +20,7 @@:label="$t('wms.stockAsnInfo.actual_qty')":rules="data.rules.putaway_qty"variant="outlined"- ></v-text-field>+ ></v-text-field> --></v-form></v-card-text><v-card-actions class="justify-end">@@ -30,64 +30,22 @@</v-card></template></v-dialog>- <locationSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ <locationSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect()" @sureSelect="method.sureSelect" /></template><script lang="ts" setup>-import { reactive, computed, ref, watch } from 'vue'-import { StockAsnVO, PutawayVo } from '@/types/WMS/StockAsn'+import { reactive, ref } from 'vue'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'-import { putawayAsn } from '@/api/wms/stockAsn'+import { getSorting } from '@/api/wms/stockAsn'import locationSelect from '@/components/select/location-select.vue'const formRef = ref()-const emit = defineEmits(['close', 'saveSuccess'])--const props = defineProps<{- showDialog: boolean- form: StockAsnVO-}>()--const isShow = computed(() => props.showDialog)--const dialogTitle = computed(() => 'update')+// const emit = defineEmits(['sure'])const data = reactive({- form: ref<StockAsnVO>({- id: 0,- asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true- }),- formPutaway: ref<PutawayVo>({- asn_id: 0,- location_name: '',- goods_location_id: 0,- putaway_qty: 0- }),+ showDialog: false,+ tableData: [],rules: {putaway_qty: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.actual_qty') }!`],location_name: [@@ -95,30 +53,35 @@ const data = reactive({]},showSkuDialogSelect: false,- curSelectType: ''+ cacheItemIndex: -1})const method = reactive({+ // Initialized Data+ initDialogData: async (id: number) => {+ const { data: res } = await getSorting(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ method.closeDialog()+ return+ }+ data.tableData = res.data+ },+ openDialog: (id: number) => {+ method.initDialogData(id)++ data.showDialog = true+ },closeDialog: () => {- emit('close')+ data.showDialog = false},submit: async () => {const { valid } = await formRef.value.validate()if (valid) {- data.formPutaway.asn_id = data.form.id- const { data: res } = await putawayAsn(data.formPutaway)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- hookComponent.$message({- type: 'success',- content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`- })- emit('saveSuccess')+ console.log()} else {hookComponent.$message({type: 'error',@@ -127,38 +90,24 @@ const method = reactive({}},- clearCommodity: () => {- data.formPutaway.goods_location_id = 0- data.formPutaway.location_name = ''+ clearCommodity: (item: { asn_id: number; location_name: string; goods_location_id: number; putaway_qty: number }) => {+ item.goods_location_id = 0+ item.location_name = ''},- openSelect: (type: string) => {- data.curSelectType = type+ openSelect: (index: number) => {+ data.cacheItemIndex = index- if (type === 'target') {- data.showSkuDialogSelect = true- }+ data.showSkuDialogSelect = true},- closeDialogSelect: (type: string) => {- if (type === 'target') {- data.showSkuDialogSelect = false- }+ closeDialogSelect: () => {+ data.showSkuDialogSelect = false},sureSelect: (selectRecords: any) => {- if (data.curSelectType === 'target') {- data.formPutaway.goods_location_id = selectRecords[0].id- data.formPutaway.location_name = selectRecords[0].location_name- }+ console.log(selectRecords)+ // data.formPutaway.goods_location_id = selectRecords[0].id+ // data.formPutaway.location_name = selectRecords[0].location_name}})--watch(- () => isShow.value,- (val) => {- if (val) {- data.form = props.form- }- }-)</script><style scoped lang="less">diff --git a/frontend/src/view/wms/stockAsn/update-sorting.vue b/frontend/src/view/wms/stockAsn/update-sorting.vueindex 2a49da3..b4fea06 100644--- a/frontend/src/view/wms/stockAsn/update-sorting.vue+++ b/frontend/src/view/wms/stockAsn/update-sorting.vue@@ -1,17 +1,49 @@<template>- <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <v-dialog v-model="data.showDialog" :width="'70%'" transition="dialog-top-transition" :persistent="true"><template #default><v-card>- <v-toolbar color="white" :title="`${$t('wms.stockAsn.tabNotice')}`"></v-toolbar>+ <v-toolbar color="white" :title="`${$t('wms.stockAsnInfo.editSorting')}`"></v-toolbar><v-card-text>- <v-form ref="formRef">- <v-text-field- v-model="data.form.sorted_qty"- :label="$t('wms.stockAsnInfo.sorted_qty')"- :rules="data.rules.sorted_qty"- variant="outlined"- ></v-text-field>- </v-form>+ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ :edit-rules="data.validRules"+ :edit-config="{ trigger: 'click', mode: 'cell', activeMethod: method.activeMethod }"+ :mouse-config="{ selected: true }"+ :keyboard-config="{ isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true }"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockAsnInfo.series_number')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.series_number" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.sorted_qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"> </vxe-column>+ <vxe-column field="create_time" :formatter="['formatDate', 'yyyy-MM-dd']" :title="$t('wms.deliveryManagement.create_time')"> </vxe-column>+ <vxe-column field="operate" :title="$t('system.page.operate')" width="100" :resizable="false" show-overflow>+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table></v-card-text><v-card-actions class="justify-end"><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>@@ -23,84 +55,99 @@</template><script lang="ts" setup>-import { reactive, computed, ref, watch } from 'vue'-import { StockAsnVO, SortingVo } from '@/types/WMS/StockAsn'+import { reactive, ref } from 'vue'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'-import { sortingAsn } from '@/api/wms/stockAsn'+import { errorColor, SYSTEM_HEIGHT } from '@/constant/style'+import { getSorting } from '@/api/wms/stockAsn'+import { UpdateSortingVo } from '@/types/WMS/StockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { isInteger } from '@/utils/dataVerification/tableRule'-const formRef = ref()-const emit = defineEmits(['close', 'saveSuccess'])+const xTable = ref()-const props = defineProps<{- showDialog: boolean- form: StockAsnVO-}>()--const isShow = computed(() => props.showDialog)--const dialogTitle = computed(() => 'update')+const emit = defineEmits(['sure'])const data = reactive({- form: ref<StockAsnVO>({- id: 0,- asn_no: '',- asn_status: 0,- spu_id: 0,- spu_code: '',- spu_name: '',- sku_id: 0,- sku_code: '',- sku_name: '',- origin: '',- length_unit: 0,- volume_unit: 0,- weight_unit: 0,- asn_qty: 0,- actual_qty: 0,- sorted_qty: 0,- shortage_qty: 0,- more_qty: 0,- damage_qty: 0,- weight: 0,- volume: 0,- supplier_id: 0,- supplier_name: '',- goods_owner_id: 0,- goods_owner_name: '',- is_valid: true- }),- formSorting: ref<SortingVo>({- asn_id: 0,- sorted_qty: 0- }),- rules: {- sorted_qty: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.sorted_qty') }!`]- }+ showDialog: false,+ tableData: [],+ validRules: {+ sorted_qty: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.sorted_qty') }` },+ {+ validator: isInteger,+ validNumerical: 'nonNegative',+ trigger: 'change'+ }+ ],+ series_number: [+ {+ type: 'string',+ min: 0,+ max: 64,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 64 }`,+ trigger: 'change'+ }+ ]+ } as any})const method = reactive({- closeDialog: () => {- emit('close')+ activeMethod({ row, column }: any) {+ if (!row.series_number && column.field === 'series_number') {+ return false+ }+ return true},- submit: async () => {- const { valid } = await formRef.value.validate()- if (valid) {- data.formSorting.asn_id = data.form.id- data.formSorting.sorted_qty = data.form.sorted_qty- const { data: res } = await sortingAsn(data.formSorting)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return+ // delete row+ deleteRow: (row: UpdateSortingVo) => {+ const $table = xTable.value+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ $table.remove(row)}+ })+ },+ // Initialize window data+ initDialogData: async (id: number) => {+ const { data: res } = await getSorting(id)+ if (!res.isSuccess) {hookComponent.$message({- type: 'success',- content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ type: 'error',+ content: res.errorMessage})- emit('saveSuccess')+ data.showDialog = false+ return+ }+ data.tableData = res.data+ },++ openDialog: async (id: number) => {+ // Initialized Data+ method.initDialogData(id)++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ },+ submit: async () => {+ const $table = xTable.value+ const errMap = await $table.validate(true)+ if (!errMap) {+ // Find the deleted data, assign a negative id to represent deletion+ const removeTableData = xTable.value.getRemoveRecords()++ // Traversing and modifying the original data, as the data is a shallow copy, there is no need to assign a value+ if (removeTableData) {+ for (const item of removeTableData) {+ item.id = 0 - item.id+ }+ }++ const tableData: any = data.tableData+ emit('sure', tableData)} else {hookComponent.$message({type: 'error',@@ -110,20 +157,10 @@ const method = reactive({}})-watch(- () => isShow.value,- (val) => {- if (val) {- data.form = props.form- }- }-)+defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})</script>-<style scoped lang="less">-.v-form {- div {- margin-bottom: 7px;- }-}-</style>+<style scoped lang="less"></style>diff --git a/frontend/src/view/wms/stockAsn/view-detail-dialog.vue b/frontend/src/view/wms/stockAsn/view-detail-dialog.vuenew file mode 100644index 0000000..c6369fe--- /dev/null+++ b/frontend/src/view/wms/stockAsn/view-detail-dialog.vue@@ -0,0 +1,85 @@+<template>+ <v-dialog v-model="data.showDialog" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stockAsnInfo.viewDetail')}`"></v-toolbar>+ <v-card-text>+ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ :mouse-config="{ selected: true }"+ :keyboard-config="{ isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true }"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"> </vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockAsnInfo.series_number')"> </vxe-column>+ </vxe-table>+ </v-card-text>+ <v-card-actions class="justify-end">+ <v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, ref } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT } from '@/constant/style'+import { getGrouding } from '@/api/wms/stockAsn'++const xTable = ref()++const data = reactive({+ showDialog: false,+ tableData: []+})++const method = reactive({+ // Initialize window data+ initDialogData: async (id: number) => {+ const { data: res } = await getGrouding(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ data.showDialog = false+ return+ }+ data.tableData = res.data+ },++ openDialog: async (id: number) => {+ // Initialized Data+ method.initDialogData(id)++ data.showDialog = true+ },+ closeDialog: () => {+ data.showDialog = false+ }+})++defineExpose({+ openDialog: method.openDialog,+ closeDialog: method.closeDialog+})+</script>++<style scoped lang="less">+.col {+ display: flex;+ align-items: center;+ margin-bottom: 10px;+}+</style>diff --git a/frontend/src/view/wms/stockManagement/tabStock.vue b/frontend/src/view/wms/stockManagement/tabStock.vueindex 5f71b1f..4959644 100644--- a/frontend/src/view/wms/stockManagement/tabStock.vue+++ b/frontend/src/view/wms/stockManagement/tabStock.vue@@ -3,8 +3,10 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->+ <!-- new version -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -74,21 +76,21 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'-import { VxePagerEvents, VxeTablePropTypes } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { computed, ref, reactive, watch, onMounted } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'import { StockVO } from '@/types/WMS/StockManagement'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { getStockList } from '@/api/wms/stockManagement'-import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTableWarehouse = ref()@@ -107,7 +109,10 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -174,6 +179,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'area-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/src/view/wms/stockManagement/tabStockLocation.vue b/frontend/src/view/wms/stockManagement/tabStockLocation.vueindex 307c5fe..9bd8d5a 100644--- a/frontend/src/view/wms/stockManagement/tabStockLocation.vue+++ b/frontend/src/view/wms/stockManagement/tabStockLocation.vue@@ -3,8 +3,9 @@<v-row no-gutters><!-- Operate Btn --><v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ <!-- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn> -->+ <BtnGroup :authority-list="data.authorityList" :btn-list="data.btnList" /></v-col><!-- Search Input -->@@ -52,6 +53,7 @@<vxe-column field="spu_name" :title="$t('wms.stockLocation.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.stockLocation.sku_code')"></vxe-column><vxe-column field="sku_name" :title="$t('wms.stockLocation.sku_name')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="qty" :title="$t('wms.stockLocation.qty')"></vxe-column><vxe-column field="qty_available" :title="$t('wms.stockLocation.qty_available')"></vxe-column><vxe-column field="qty_locked" :title="$t('wms.stockLocation.qty_locked')"></vxe-column>@@ -72,21 +74,21 @@</template><script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'+import { computed, ref, reactive, watch, onMounted } from 'vue'import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { computedCardHeight, computedTableHeight } from '@/constant/style'import { StockLocationVO } from '@/types/WMS/StockManagement'import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'-import { setSearchObject } from '@/utils/common'-import { SearchObject } from '@/types/System/Form'+import { setSearchObject, getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'import { getStockLocationList } from '@/api/wms/stockManagement'-import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import skuInfo from './sku-info.vue'import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'const xTableStockLocation = ref()@@ -105,7 +107,10 @@ const data = reactive({pageSize: DEFAULT_PAGE_SIZE,searchObjects: ref<Array<SearchObject>>([])}),- timer: ref<any>(null)+ timer: ref<any>(null),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({@@ -154,6 +159,23 @@ const method = reactive({}})+onMounted(() => {+ data.btnList = [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'stock-export',+ click: method.exportTable+ }+ ]+})+const cardHeight = computed(() => computedCardHeight({}))const tableHeight = computed(() => computedTableHeight({}))diff --git a/frontend/tsconfig.json b/frontend/tsconfig.jsonindex 2a99648..81a9b23 100644--- a/frontend/tsconfig.json+++ b/frontend/tsconfig.json@@ -12,13 +12,16 @@"lib": ["ESNext", "DOM"],"skipLibCheck": true,"noEmit": true,+ "noImplicitAny": false, // 屏蔽隐式any类型报错// 加入以下配置项+ // "suppressImplicitAnyIndexErrors":true, //对象可使用[]方式"baseUrl": ".", // 用于设置解析非相对模块名称的基本目录,相对模块不会受到baseUrl的影响"paths": {// 用于设置模块名到基于baseUrl的路径映射"@/*": ["src/*"]- }+ },+ "allowJs": true},- "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "src/api/sys/login.tsn.tssrc/api/sys/login.tslogisrc/api/sys/login.tssys/src/api/sys/login.tsapi/sys/login.ts"],+ "include": ["src/**/*.ts","src/**/*", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "src/api/sys/login.tsn.tssrc/api/sys/login.tslogisrc/api/sys/login.tssys/src/api/sys/login.tsapi/sys/login.ts","src/hiprint/etypes/default-etyps-provider.js","src/hiprint/plugins/jquery.hiwprint.js","src/hiprint/plugins/qrcode.js","src/hiprint/plugins/watermark.js","src/hiprint/hiprint.bundle.js","src/hiprint/hiprint.config.js","src/hiprint/index.js"],"references": [{ "path": "./tsconfig.node.json" }]}diff --git a/frontend/vite.config.ts b/frontend/vite.config.tsindex 4a96d92..31901e9 100644--- a/frontend/vite.config.ts+++ b/frontend/vite.config.ts@@ -22,5 +22,9 @@ export default defineConfig({javascriptEnabled: true}}+ },+ // ...其他配置项+ optimizeDeps: {+ include: ['jquery']}})