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(Global):Sync gitee code with frontend on 2023-01-09 09:14.
Jokerls波吉5e050ee6dec0
diff --git a/frontend/.env.development b/frontend/.env.developmentindex 76fc923..7c552fc 100644--- a/frontend/.env.development+++ b/frontend/.env.development@@ -1,6 +1,6 @@ENV = 'development'VITE_CLI_PORT = 5173-VITE_SERVER_PORT = 11025+VITE_SERVER_PORT = 21011VITE_BASE_API = /api-VITE_BASE_PATH = http://192.168.103.29+VITE_BASE_PATH = http://192.168.103.80diff --git a/frontend/.env.production b/frontend/.env.productionindex 56fc150..39576f1 100644--- a/frontend/.env.production+++ b/frontend/.env.production@@ -1,8 +1,6 @@ENV = 'production'-VITE_CLI_PORT = 8080-VITE_SERVER_PORT = 8888+VITE_CLI_PORT = 5174+VITE_SERVER_PORT = 20011VITE_BASE_API = /api-#下方修改为你的线上ip 如果 https模式下则使用域名 并且配置代理 (不建议上线使用表单生成器)-#VITE_BASE_PATH = http://x.x.x.x-#VITE_BASE_PATH = https://xxx+VITE_BASE_PATH = https://wmsonline.ikeyly.comdiff --git a/frontend/.eslintrc b/frontend/.eslintrcindex 89bdf57..973a451 100644--- a/frontend/.eslintrc+++ b/frontend/.eslintrc@@ -2,18 +2,16 @@"root": true,"globals": {"defineEmits": "readonly",- "defineProps": "readonly"+ "defineProps": "readonly",+ "defineExpose": "readonly"},- "extends": [- "plugin:@typescript-eslint/recommended",- "plugin:vue/vue3-recommended",- "airbnb-base"- ],+ "extends": ["plugin:@typescript-eslint/recommended", "plugin:vue/vue3-recommended", "airbnb-base"],"parserOptions": {"parser": "@typescript-eslint/parser","ecmaVersion": 2020},"rules": {+ "camelcase": "off","no-bitwise": "off", // 禁用按位运算符"no-tabs": "off", // 禁用 tab"array-element-newline": ["error", "consistent"], // 强制数组元素间出现换行@@ -21,7 +19,7 @@"quotes": ["error", "single"], // 强制使用一致的反勾号、双引号或单引号"comma-dangle": "off", // 要求或禁止末尾逗号"object-curly-spacing": ["error", "always"], // 强制在大括号中使用一致的空格- "max-len": ["error", 120], // 强制一行的最大长度+ "max-len": ["error", 200], // 强制一行的最大长度; 注意: 这里特意调整的比prettierrc多50, 因为某些情况下两个插件格式化出来的结果不同导致界面上有波浪线"no-new": "off", // 禁止使用 new 以避免产生副作用"linebreak-style": "off", // 强制使用一致的换行风格"import/extensions": "off", // 确保在导入路径中统一使用文件扩展名diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.jsonindex fe959a7..ff2eec4 100644--- a/frontend/.prettierrc.json+++ b/frontend/.prettierrc.json@@ -1,6 +1,6 @@{"eslintIntegration": false,- "printWidth": 120,+ "printWidth": 150,"tabWidth": 2,"useTabs": false,"semi": false,@@ -16,4 +16,4 @@"proseWrap": "never","htmlWhitespaceSensitivity": "strict","endOfLine": "lf"-}+}\ No newline at end of filediff --git a/frontend/components.d.ts b/frontend/components.d.tsindex 507c413..607d675 100644--- a/frontend/components.d.ts+++ b/frontend/components.d.ts@@ -7,13 +7,6 @@ export {}declare module '@vue/runtime-core' {export interface GlobalComponents {- ElButton: typeof import('element-plus/es')['ElButton']- ElDropdown: typeof import('element-plus/es')['ElDropdown']- ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']- ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']- ElIcon: typeof import('element-plus/es')['ElIcon']- Languages: typeof import('./src/components/common/languages.vue')['default']- LoginForm: typeof import('./src/components/login/loginForm.vue')['default']RouterLink: typeof import('vue-router')['RouterLink']RouterView: typeof import('vue-router')['RouterView']}diff --git a/frontend/index.html b/frontend/index.htmlindex 14ba63b..31e1e1c 100644--- a/frontend/index.html+++ b/frontend/index.html@@ -3,9 +3,9 @@<head><meta charset="UTF-8" />- <link rel="icon" type="image/svg+xml" href="/vite.svg" /><meta name="viewport" content="width=device-width, initial-scale=1.0" /><title>ModernWMS</title>+ <link rel="icon" href="./src/assets/img/webLogoMini.png" /></head><body>diff --git a/frontend/package-lock.json b/frontend/package-lock.jsonindex f664277..338e7c8 100644--- a/frontend/package-lock.json+++ b/frontend/package-lock.json@@ -4,6 +4,22 @@"lockfileVersion": 1,"requires": true,"dependencies": {+ "@antfu/install-pkg": {+ "version": "0.1.1",+ "resolved": "https://registry.npmmirror.com/@antfu/install-pkg/-/install-pkg-0.1.1.tgz",+ "integrity": "sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==",+ "dev": true,+ "requires": {+ "execa": "^5.1.1",+ "find-up": "^5.0.0"+ }+ },+ "@antfu/utils": {+ "version": "0.7.2",+ "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.2.tgz",+ "integrity": "sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g==",+ "dev": true+ },"@babel/code-frame": {"version": "7.18.6","resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",@@ -202,6 +218,80 @@"dev": true,"optional": true},+ "@iconify/types": {+ "version": "2.0.0",+ "resolved": "https://registry.npmmirror.com/@iconify/types/-/types-2.0.0.tgz",+ "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",+ "dev": true+ },+ "@iconify/utils": {+ "version": "2.0.9",+ "resolved": "https://registry.npmmirror.com/@iconify/utils/-/utils-2.0.9.tgz",+ "integrity": "sha512-ropNqaeamoxZvXxvaTJXrI0MrqdWdDVIs/mW7/sEQbNi0aXYUGL2iuLs1da3QR163gyG63kiyTsqw2oQYamw3Q==",+ "dev": true,+ "requires": {+ "@antfu/install-pkg": "^0.1.1",+ "@antfu/utils": "^0.7.2",+ "@iconify/types": "^2.0.0",+ "debug": "^4.3.4",+ "kolorist": "^1.6.0",+ "local-pkg": "^0.4.2"+ }+ },+ "@intlify/core-base": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.2.2.tgz",+ "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",+ "requires": {+ "@intlify/devtools-if": "9.2.2",+ "@intlify/message-compiler": "9.2.2",+ "@intlify/shared": "9.2.2",+ "@intlify/vue-devtools": "9.2.2"+ }+ },+ "@intlify/devtools-if": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",+ "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",+ "requires": {+ "@intlify/shared": "9.2.2"+ }+ },+ "@intlify/message-compiler": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",+ "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",+ "requires": {+ "@intlify/shared": "9.2.2",+ "source-map": "0.6.1"+ }+ },+ "@intlify/shared": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.2.2.tgz",+ "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q=="+ },+ "@intlify/vue-devtools": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",+ "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",+ "requires": {+ "@intlify/core-base": "9.2.2",+ "@intlify/shared": "9.2.2"+ }+ },+ "@jridgewell/sourcemap-codec": {+ "version": "1.4.14",+ "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",+ "dev": true+ },+ "@mdi/font": {+ "version": "7.1.96",+ "resolved": "https://registry.npmmirror.com/@mdi/font/-/font-7.1.96.tgz",+ "integrity": "sha512-Imag6npmfkBDi2Ze2jiZVAPTDIKLxhz2Sx82xJ2zctyAU5LYJejLI5ChnDwiD9bMkQfVuzEsI98Q8toHyC+HCg==",+ "dev": true+ },"@nodelib/fs.scandir": {"version": "2.1.5","resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",@@ -228,6 +318,23 @@"fastq": "^1.6.0"}},+ "@rollup/pluginutils": {+ "version": "5.0.2",+ "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",+ "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",+ "dev": true,+ "requires": {+ "@types/estree": "^1.0.0",+ "estree-walker": "^2.0.2",+ "picomatch": "^2.3.1"+ }+ },+ "@types/estree": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.0.tgz",+ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",+ "dev": true+ },"@types/json-schema": {"version": "7.0.11","resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",@@ -571,6 +678,16 @@"color-convert": "^1.9.0"}},+ "anymatch": {+ "version": "3.1.3",+ "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",+ "dev": true,+ "requires": {+ "normalize-path": "^3.0.0",+ "picomatch": "^2.0.4"+ }+ },"argparse": {"version": "1.0.10","resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",@@ -638,6 +755,12 @@"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==","dev": true},+ "binary-extensions": {+ "version": "2.2.0",+ "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",+ "dev": true+ },"brace-expansion": {"version": "2.0.1","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",@@ -729,6 +852,22 @@"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==","dev": true},+ "chokidar": {+ "version": "3.5.3",+ "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",+ "dev": true,+ "requires": {+ "anymatch": "~3.1.2",+ "braces": "~3.0.2",+ "fsevents": "~2.3.2",+ "glob-parent": "~5.1.2",+ "is-binary-path": "~2.1.0",+ "is-glob": "~4.0.1",+ "normalize-path": "~3.0.0",+ "readdirp": "~3.6.0"+ }+ },"cli-cursor": {"version": "3.1.0","resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",@@ -825,6 +964,11 @@"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==","dev": true},+ "deepmerge": {+ "version": "4.2.2",+ "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz",+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="+ },"define-properties": {"version": "1.1.4","resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",@@ -1337,6 +1481,23 @@"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==","dev": true},+ "execa": {+ "version": "5.1.1",+ "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",+ "dev": true,+ "requires": {+ "cross-spawn": "^7.0.3",+ "get-stream": "^6.0.0",+ "human-signals": "^2.1.0",+ "is-stream": "^2.0.0",+ "merge-stream": "^2.0.0",+ "npm-run-path": "^4.0.1",+ "onetime": "^5.1.2",+ "signal-exit": "^3.0.3",+ "strip-final-newline": "^2.0.0"+ }+ },"external-editor": {"version": "3.1.0","resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",@@ -1415,6 +1576,16 @@"to-regex-range": "^5.0.1"}},+ "find-up": {+ "version": "5.0.0",+ "resolved": "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz",+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",+ "dev": true,+ "requires": {+ "locate-path": "^6.0.0",+ "path-exists": "^4.0.0"+ }+ },"flat-cache": {"version": "2.0.1","resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",@@ -1501,6 +1672,12 @@"has-symbols": "^1.0.3"}},+ "get-stream": {+ "version": "6.0.1",+ "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",+ "dev": true+ },"get-symbol-description": {"version": "1.0.0","resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",@@ -1645,6 +1822,12 @@"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==","dev": true},+ "human-signals": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",+ "dev": true+ },"iconv-lite": {"version": "0.4.24","resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",@@ -1740,6 +1923,15 @@"has-bigints": "^1.0.1"}},+ "is-binary-path": {+ "version": "2.1.0",+ "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",+ "dev": true,+ "requires": {+ "binary-extensions": "^2.0.0"+ }+ },"is-boolean-object": {"version": "1.1.2","resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",@@ -1835,6 +2027,12 @@"call-bind": "^1.0.2"}},+ "is-stream": {+ "version": "2.0.1",+ "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",+ "dev": true+ },"is-string": {"version": "1.0.7","resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",@@ -1911,12 +2109,24 @@"minimist": "^1.2.0"}},+ "jsonc-parser": {+ "version": "3.2.0",+ "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz",+ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",+ "dev": true+ },"klona": {"version": "2.0.5","resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz","integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==","dev": true},+ "kolorist": {+ "version": "1.6.0",+ "resolved": "https://registry.npmmirror.com/kolorist/-/kolorist-1.6.0.tgz",+ "integrity": "sha512-dLkz37Ab97HWMx9KTes3Tbi3D1ln9fCAy2zr2YVExJasDRPGRaKcoE4fycWNtnCAJfjFqe0cnY+f8KT2JePEXQ==",+ "dev": true+ },"less": {"version": "4.1.3","resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz",@@ -1962,6 +2172,21 @@"type-check": "~0.4.0"}},+ "local-pkg": {+ "version": "0.4.2",+ "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.2.tgz",+ "integrity": "sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==",+ "dev": true+ },+ "locate-path": {+ "version": "6.0.0",+ "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz",+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",+ "dev": true,+ "requires": {+ "p-locate": "^5.0.0"+ }+ },"lodash": {"version": "4.17.21","resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",@@ -2005,6 +2230,18 @@}}},+ "material-design-icons-iconfont": {+ "version": "6.7.0",+ "resolved": "https://registry.npmmirror.com/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",+ "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA==",+ "dev": true+ },+ "merge-stream": {+ "version": "2.0.0",+ "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",+ "dev": true+ },"merge2": {"version": "1.4.1","resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",@@ -2062,6 +2299,11 @@"integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==","dev": true},+ "mitt": {+ "version": "3.0.0",+ "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.0.tgz",+ "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="+ },"mkdirp": {"version": "0.5.6","resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",@@ -2071,6 +2313,26 @@"minimist": "^1.2.6"}},+ "mlly": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.0.0.tgz",+ "integrity": "sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.1",+ "pathe": "^1.0.0",+ "pkg-types": "^1.0.0",+ "ufo": "^1.0.0"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ }+ }+ },"ms": {"version": "2.1.2","resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",@@ -2140,6 +2402,21 @@}}},+ "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+ },+ "npm-run-path": {+ "version": "4.0.1",+ "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",+ "dev": true,+ "requires": {+ "path-key": "^3.0.0"+ }+ },"object-inspect": {"version": "1.12.2","resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",@@ -2224,6 +2501,24 @@"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==","dev": true},+ "p-limit": {+ "version": "3.1.0",+ "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz",+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",+ "dev": true,+ "requires": {+ "yocto-queue": "^0.1.0"+ }+ },+ "p-locate": {+ "version": "5.0.0",+ "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz",+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",+ "dev": true,+ "requires": {+ "p-limit": "^3.0.2"+ }+ },"parent-module": {"version": "1.0.1","resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",@@ -2239,6 +2534,12 @@"integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==","dev": true},+ "path-exists": {+ "version": "4.0.0",+ "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",+ "dev": true+ },"path-is-absolute": {"version": "1.0.1","resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",@@ -2263,6 +2564,12 @@"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==","dev": true},+ "pathe": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/pathe/-/pathe-1.0.0.tgz",+ "integrity": "sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==",+ "dev": true+ },"picocolors": {"version": "1.0.0","resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",@@ -2281,6 +2588,17 @@"dev": true,"optional": true},+ "pkg-types": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.0.1.tgz",+ "integrity": "sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==",+ "dev": true,+ "requires": {+ "jsonc-parser": "^3.2.0",+ "mlly": "^1.0.0",+ "pathe": "^1.0.0"+ }+ },"postcss": {"version": "8.4.19","resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",@@ -2327,6 +2645,15 @@"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==","dev": true},+ "readdirp": {+ "version": "3.6.0",+ "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",+ "dev": true,+ "requires": {+ "picomatch": "^2.2.1"+ }+ },"regexp.prototype.flags": {"version": "1.4.3","resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",@@ -2443,6 +2770,12 @@"dev": true,"optional": true},+ "scule": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/scule/-/scule-1.0.0.tgz",+ "integrity": "sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==",+ "dev": true+ },"semver": {"version": "7.3.8","resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",@@ -2578,12 +2911,35 @@"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==","dev": true},+ "strip-final-newline": {+ "version": "2.0.0",+ "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",+ "dev": true+ },"strip-json-comments": {"version": "3.1.1","resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz","integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==","dev": true},+ "strip-literal": {+ "version": "1.0.0",+ "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-1.0.0.tgz",+ "integrity": "sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.1"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ }+ }+ },"supports-color": {"version": "5.5.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",@@ -2681,6 +3037,11 @@"is-number": "^7.0.0"}},+ "ts-md5": {+ "version": "1.3.1",+ "resolved": "https://registry.npmmirror.com/ts-md5/-/ts-md5-1.3.1.tgz",+ "integrity": "sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg=="+ },"tsconfig-paths": {"version": "3.14.1","resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",@@ -2729,6 +3090,12 @@"integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==","dev": true},+ "ufo": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.0.1.tgz",+ "integrity": "sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==",+ "dev": true+ },"unbox-primitive": {"version": "1.0.2","resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",@@ -2741,6 +3108,131 @@"which-boxed-primitive": "^1.0.2"}},+ "unimport": {+ "version": "1.1.0",+ "resolved": "https://registry.npmmirror.com/unimport/-/unimport-1.1.0.tgz",+ "integrity": "sha512-dSufi3POQWUVAMU6DxXu39U0cWzz5m3FtQBUbgDJTkCpeRfyiYhDg+BOz6UPKfDPtEhkbshV8JoMV3I8i/mQ+A==",+ "dev": true,+ "requires": {+ "@rollup/pluginutils": "^5.0.2",+ "escape-string-regexp": "^5.0.0",+ "fast-glob": "^3.2.12",+ "local-pkg": "^0.4.2",+ "magic-string": "^0.27.0",+ "mlly": "^1.0.0",+ "pathe": "^1.0.0",+ "pkg-types": "^1.0.1",+ "scule": "^1.0.0",+ "strip-literal": "^1.0.0",+ "unplugin": "^1.0.1"+ },+ "dependencies": {+ "escape-string-regexp": {+ "version": "5.0.0",+ "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",+ "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",+ "dev": true+ },+ "magic-string": {+ "version": "0.27.0",+ "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",+ "dev": true,+ "requires": {+ "@jridgewell/sourcemap-codec": "^1.4.13"+ }+ }+ }+ },+ "unplugin": {+ "version": "1.0.1",+ "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.0.1.tgz",+ "integrity": "sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==",+ "dev": true,+ "requires": {+ "acorn": "^8.8.1",+ "chokidar": "^3.5.3",+ "webpack-sources": "^3.2.3",+ "webpack-virtual-modules": "^0.5.0"+ },+ "dependencies": {+ "acorn": {+ "version": "8.8.1",+ "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.1.tgz",+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",+ "dev": true+ }+ }+ },+ "unplugin-auto-import": {+ "version": "0.12.1",+ "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.12.1.tgz",+ "integrity": "sha512-J/3ZORq5YGKG+8D5vLLOgqaHNK77izlVN07mQ752yRLqBNDbJiwPRSnUwwYqH5N6rDay1SqnJCHaUdbJ9QMI2w==",+ "dev": true,+ "requires": {+ "@antfu/utils": "^0.7.2",+ "@rollup/pluginutils": "^5.0.2",+ "local-pkg": "^0.4.2",+ "magic-string": "^0.27.0",+ "unimport": "^1.0.2",+ "unplugin": "^1.0.1"+ },+ "dependencies": {+ "magic-string": {+ "version": "0.27.0",+ "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",+ "dev": true,+ "requires": {+ "@jridgewell/sourcemap-codec": "^1.4.13"+ }+ }+ }+ },+ "unplugin-icons": {+ "version": "0.14.15",+ "resolved": "https://registry.npmmirror.com/unplugin-icons/-/unplugin-icons-0.14.15.tgz",+ "integrity": "sha512-J6YBA+fUzVM2IZPXCK3Pnk36jYVwQ6lkjRgOnZaXNIxpMDsmwDqrE1AGJ0zUbfuEoOa90OBGc0OPfN1r+qlSIQ==",+ "dev": true,+ "requires": {+ "@antfu/install-pkg": "^0.1.1",+ "@antfu/utils": "^0.7.2",+ "@iconify/utils": "^2.0.3",+ "debug": "^4.3.4",+ "kolorist": "^1.6.0",+ "local-pkg": "^0.4.2",+ "unplugin": "^1.0.1"+ }+ },+ "unplugin-vue-components": {+ "version": "0.22.12",+ "resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.22.12.tgz",+ "integrity": "sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==",+ "dev": true,+ "requires": {+ "@antfu/utils": "^0.7.2",+ "@rollup/pluginutils": "^5.0.2",+ "chokidar": "^3.5.3",+ "debug": "^4.3.4",+ "fast-glob": "^3.2.12",+ "local-pkg": "^0.4.2",+ "magic-string": "^0.27.0",+ "minimatch": "^5.1.1",+ "resolve": "^1.22.1",+ "unplugin": "^1.0.1"+ },+ "dependencies": {+ "magic-string": {+ "version": "0.27.0",+ "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",+ "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",+ "dev": true,+ "requires": {+ "@jridgewell/sourcemap-codec": "^1.4.13"+ }+ }+ }+ },"uri-js": {"version": "4.4.1","resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",@@ -2831,6 +3323,17 @@}}},+ "vue-i18n": {+ "version": "9.2.2",+ "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.2.2.tgz",+ "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",+ "requires": {+ "@intlify/core-base": "9.2.2",+ "@intlify/shared": "9.2.2",+ "@intlify/vue-devtools": "9.2.2",+ "@vue/devtools-api": "^6.2.1"+ }+ },"vue-router": {"version": "4.1.6","resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",@@ -2859,6 +3362,11 @@"@volar/vue-typescript": "1.0.12"}},+ "vuetify": {+ "version": "3.1.0",+ "resolved": "https://registry.npmmirror.com/vuetify/-/vuetify-3.1.0.tgz",+ "integrity": "sha512-v0+5eNq4GPXGcJ0F2dwJDbQOhuZhEgoiUDWHXqgWJixzc9mzwt+4nSmPz0vYPYl9oC3UFf3Se+vh0xNoRjv4Ig=="+ },"vuex": {"version": "4.0.2","resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz",@@ -2867,6 +3375,39 @@"@vue/devtools-api": "^6.0.0-beta.11"}},+ "vuex-persist": {+ "version": "3.1.3",+ "resolved": "https://registry.npmmirror.com/vuex-persist/-/vuex-persist-3.1.3.tgz",+ "integrity": "sha512-QWOpP4SxmJDC5Y1+0+Yl/F4n7z27syd1St/oP+IYCGe0X0GFio0Zan6kngZFufdIhJm+5dFGDo3VG5kdkCGeRQ==",+ "requires": {+ "deepmerge": "^4.2.2",+ "flatted": "^3.0.5"+ },+ "dependencies": {+ "flatted": {+ "version": "3.2.7",+ "resolved": "https://registry.npmmirror.com/flatted/-/flatted-3.2.7.tgz",+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="+ }+ }+ },+ "vxe-table": {+ "version": "4.3.7",+ "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.3.7.tgz",+ "integrity": "sha512-v+d7eEQ5uqtVTQCts4xkW0S15LZcIuEukYHGXI53SdoUj2gLFggPYAxQr1y659CM/ESRWPz9LNVHpd97KkjGHw=="+ },+ "webpack-sources": {+ "version": "3.2.3",+ "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",+ "dev": true+ },+ "webpack-virtual-modules": {+ "version": "0.5.0",+ "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",+ "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",+ "dev": true+ },"which": {"version": "2.0.2","resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",@@ -2910,11 +3451,22 @@"mkdirp": "^0.5.1"}},+ "xe-utils": {+ "version": "3.5.7",+ "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.7.tgz",+ "integrity": "sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew=="+ },"yallist": {"version": "4.0.0","resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz","integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==","dev": true+ },+ "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}}}diff --git a/frontend/package.json b/frontend/package.jsonindex 806250d..25f771c 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -10,6 +10,8 @@},"dependencies": {"axios": "^1.2.1",+ "exceljs": "^4.3.0",+ "lottie-web": "^5.10.1","mitt": "^3.0.0","ts-md5": "^1.3.1","vue": "^3.2.45",@@ -17,7 +19,11 @@"vue-router": "^4.1.6","vuetify": "^3.0.4","vuex": "^4.0.2",- "vuex-persist": "^3.1.3"+ "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"},"devDependencies": {"@mdi/font": "^7.1.96",diff --git a/frontend/readme.txt b/frontend/readme.txtnew file mode 100644index 0000000..e69de29diff --git a/frontend/src/App.vue b/frontend/src/App.vueindex bf15ef9..d0b4801 100644--- a/frontend/src/App.vue+++ b/frontend/src/App.vue@@ -1,5 +1,5 @@<template>- <div>+ <div class="appViewContainer"><v-dialog v-model="loadingFlag" :scrim="false" persistent max-width="200"><v-card color="primary"><v-card-text>@@ -8,36 +8,76 @@</v-card-text></v-card></v-dialog>- <router-view></router-view>+ <div v-show="loadingFlag" class="mask"></div>+ <router-view v-if="data.isShow"></router-view></div></template><script setup lang="ts">-import { onMounted, ref } from 'vue'+import { reactive, nextTick, onMounted, ref, computed, watch } from 'vue'import { emitter } from './utils/bus'+import { store } from './store'const loadingFlag = ref(false)-onMounted(() => {- // const customerLang = localStorage.getItem('language')- // if (customerLang) {- // console.log(customerLang)- // }+const data = reactive({+ isShow: true // Used to refresh the interface when switching languages+})++const method = reactive({+ refreshSystem: () => {+ data.isShow = false+ nextTick(() => {+ data.isShow = true+ store.commit('system/setRefreshFlag', false)+ })+ },+ getClientSize: () => {+ const clientHeight = document.documentElement.clientHeight+ const clientWidth = document.documentElement.clientWidth+ store.commit('system/setClientHeight', clientHeight)+ store.commit('system/setClientWidth', clientWidth)+ }+})++const refreshFlag = computed(() => store.getters['system/refreshFlag'])++watch(+ () => refreshFlag.value,+ (flag) => {+ if (flag) {+ method.refreshSystem()+ }+ }+)+onMounted(() => {emitter.on('showLoading', () => {- // console.log('showloading')loadingFlag.value = true})emitter.on('closeLoading', () => {- // console.log('closeLoading')loadingFlag.value = false})++ method.getClientSize()++ window.onresize = function () {+ method.getClientSize()+ }})</script><style scoped>-div {+.appViewContainer {height: 100%;width: 100%;+ background-color: #f4f5fa;+}++.mask {+ position: absolute;+ z-index: 9999;+ width: 100vw;+ height: 100vh;}</style>diff --git a/frontend/src/api/base/commodityCategorySetting.ts b/frontend/src/api/base/commodityCategorySetting.tsnew file mode 100644index 0000000..0fa6cd9--- /dev/null+++ b/frontend/src/api/base/commodityCategorySetting.ts@@ -0,0 +1,31 @@+import http from '@/utils/http/request'+import { CategoryVO } from '@/types/Base/CommodityCategorySetting'++// Get all+export const getCategoryAll = () => http({+ url: '/category/all',+ method: 'get'+ })++// Add a new form+export const addCategory = (data: CategoryVO) => http({+ url: '/category',+ method: 'post',+ data+ })++// Update form+export const updateCategory = (data: CategoryVO) => http({+ url: '/category',+ method: 'put',+ data+ })++// Delete form+export const deleteCategory = (id: number) => http({+ url: '/category',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/commodityManagementSetting.ts b/frontend/src/api/base/commodityManagementSetting.tsnew file mode 100644index 0000000..2a3bc2b--- /dev/null+++ b/frontend/src/api/base/commodityManagementSetting.ts@@ -0,0 +1,33 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { CommodityVO } from '@/types/Base/CommodityManagement'++// Find Data by Pagination+export const getSpuList = (data: PageConfigProps) => http({+ url: '/spu/list',+ method: 'post',+ data+})++// Add a new form+export const addSpu = (data: CommodityVO) => http({+ url: '/spu',+ method: 'post',+ data+ })++// Update form+export const updateSpu = (data: CommodityVO) => http({+ url: '/spu',+ method: 'put',+ data+ })++// Delete form+export const deleteSpu = (id: number) => http({+ url: '/spu',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/companySetting.ts b/frontend/src/api/base/companySetting.tsnew file mode 100644index 0000000..9bc8a3b--- /dev/null+++ b/frontend/src/api/base/companySetting.ts@@ -0,0 +1,31 @@+import http from '@/utils/http/request'+import { CompanyVO } from '@/types/Base/CompanySetting'++// Get all+export const getCompanyAll = () => http({+ url: '/company/all',+ method: 'get'+ })++// Add a new form+export const addCompany = (data: CompanyVO) => http({+ url: '/company',+ method: 'post',+ data+ })++// Update form+export const updateCompany = (data: CompanyVO) => http({+ url: '/company',+ method: 'put',+ data+ })++// Delete form+export const deleteCompany = (id: number) => http({+ url: '/company',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/customer.ts b/frontend/src/api/base/customer.tsnew file mode 100644index 0000000..1efaa15--- /dev/null+++ b/frontend/src/api/base/customer.ts@@ -0,0 +1,46 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { CustomerVO, CustomerExcelVO } from '@/types/Base/Customer'++// Get all+export const getCustomerAll = () => http({+ url: '/customer/all',+ method: 'get'+ })++// Find Data by Pagination+export const getCustomerList = (data: PageConfigProps) => http({+ url: '/customer/list',+ method: 'post',+ data+ })++// Add a new form+export const addCustomer = (data: CustomerVO) => http({+ url: '/customer',+ method: 'post',+ data+ })++// Update form+export const updateCustomer = (data: CustomerVO) => http({+ url: '/customer',+ method: 'put',+ data+ })++// Delete form+export const deleteCustomer = (id: number) => http({+ url: '/customer',+ method: 'delete',+ params: {+ id+ }+ })++// Excel Import+export const excelImport = (data: Array<CustomerExcelVO>) => http({+ url: '/customer/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/freightSetting.ts b/frontend/src/api/base/freightSetting.tsnew file mode 100644index 0000000..1ec7af9--- /dev/null+++ b/frontend/src/api/base/freightSetting.ts@@ -0,0 +1,47 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { FreightVO } from '@/types/Base/Freight'++// Find Data by Pagination+export const getFreightList = (data: PageConfigProps) => http({+ url: '/freightfee/list',+ method: 'post',+ data+ })++// get data all+export const getFreightAll = () => http({+ url: '/freightfee/all',+ method: 'get',+ hideLoading: true+ })++// Add a new freightfee+export const addFreight = (data: FreightVO) => http({+ url: '/freightfee',+ method: 'post',+ data+ })++// Update freightfee+export const updateFreight = (data: FreightVO) => http({+ url: '/freightfee',+ method: 'put',+ data+ })++// Delete freightfee+export const deleteFreight = (id: number) => http({+ url: '/freightfee',+ method: 'delete',+ params: {+ id+ }+ })++// Excel Import+export const excelImport = (data: Array<FreightVO>) => http({+ url: '/freightfee/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/ownerOfCargo.ts b/frontend/src/api/base/ownerOfCargo.tsnew file mode 100644index 0000000..2cd19ba--- /dev/null+++ b/frontend/src/api/base/ownerOfCargo.ts@@ -0,0 +1,46 @@+import http from '@/utils/http/request'+import { OwnerOfCargoVO } from '@/types/Base/OwnerOfCargo'+import { PageConfigProps } from '@/types/System/Form'++// Get all+export const getOwnerOfCargoAll = () => http({+ url: '/goodsowner/all',+ method: 'get'+ })++// Get data by page+export const getOwnerOfCargoByPage = (data: PageConfigProps) => http({+ url: '/goodsowner/list',+ method: 'post',+ data+ })++// Add a new form+export const addOwnerOfCargo = (data: OwnerOfCargoVO) => http({+ url: '/goodsowner',+ method: 'post',+ data+ })++// Update form+export const updateOwnerOfCargo = (data: OwnerOfCargoVO) => http({+ url: '/goodsowner',+ method: 'put',+ data+ })++// Delete form+export const deleteOwnerOfCargo = (id: number) => http({+ url: '/goodsowner',+ method: 'delete',+ params: {+ id+ }+ })++// import form+export const excelImport = (data: OwnerOfCargoVO[]) => http({+ url: '/goodsowner/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/roleMenu.ts b/frontend/src/api/base/roleMenu.tsnew file mode 100644index 0000000..90d9852--- /dev/null+++ b/frontend/src/api/base/roleMenu.ts@@ -0,0 +1,55 @@+import http from '@/utils/http/request'+import { RoleMenuVO } from '@/types/Base/RoleMenu'++// Get user authority+export const getUserAuthority = (userrole_id: number) => http({+ url: '/rolemenu/authority',+ method: 'get',+ params: {+ userrole_id+ }+ })++// Get all+export const getRoleMenuAll = () => http({+ url: '/rolemenu/all',+ method: 'get'+ })++// Get all menu setting+export const getMenus = () => http({+ url: '/rolemenu/menus',+ method: 'get'+ })++// Get form by id+export const getRoleMenuById = (userrole_id: number) => http({+ url: '/rolemenu',+ method: 'get',+ params: {+ userrole_id+ }+ })++// Get form by id+export const addRoleMenu = (data: RoleMenuVO) => http({+ url: '/rolemenu',+ method: 'post',+ data+ })++// Update form+export const updateRoleMenu = (data: RoleMenuVO) => http({+ url: '/rolemenu',+ method: 'put',+ data+ })++// Delete form+export const deleteRoleMenu = (userrole_id: number) => http({+ url: '/rolemenu',+ method: 'delete',+ params: {+ userrole_id+ }+ })diff --git a/frontend/src/api/base/supplier.ts b/frontend/src/api/base/supplier.tsnew file mode 100644index 0000000..a3a03d8--- /dev/null+++ b/frontend/src/api/base/supplier.ts@@ -0,0 +1,46 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { SupplierVO, SupplierExcelVO } from '@/types/Base/Supplier'++// Get all+export const getSupplierAll = () => http({+ url: '/supplier/all',+ method: 'get'+ })++// Find Data by Pagination+export const getSupplierList = (data: PageConfigProps) => http({+ url: '/supplier/list',+ method: 'post',+ data+ })++// Add a new form+export const addSupplier = (data: SupplierVO) => http({+ url: '/supplier',+ method: 'post',+ data+ })++// Update form+export const updateSupplier = (data: SupplierVO) => http({+ url: '/supplier',+ method: 'put',+ data+ })++// Delete form+export const deleteSupplier = (id: number) => http({+ url: '/supplier',+ method: 'delete',+ params: {+ id+ }+ })++// Excel Import+export const excelImport = (data: Array<SupplierExcelVO>) => http({+ url: '/supplier/excel',+ method: 'post',+ data+})\ No newline at end of filediff --git a/frontend/src/api/base/userManagement.ts b/frontend/src/api/base/userManagement.tsnew file mode 100644index 0000000..156078c--- /dev/null+++ b/frontend/src/api/base/userManagement.ts@@ -0,0 +1,69 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { UserVO, ChangePwdAPIParams, ImportVO } from '@/types/Base/UserManagement'++// Find Data by Pagination+export const getSelectItem = () => http({+ url: '/user/select-item',+ method: 'get'+ })++// Find Data by Pagination+export const getUserList = (data: PageConfigProps) => http({+ url: '/user/list',+ method: 'post',+ data+ })++// Add a new user+export const addUser = (data: UserVO) => http({+ url: '/user',+ method: 'post',+ data+ })++ // Register a new user+export const registerUser = (data: UserVO) => http({+ url: '/user/register',+ method: 'post',+ data+ })++// Update user+export const updateUser = (data: UserVO) => http({+ url: '/user',+ method: 'put',+ data+ })++// Delete user+export const deleteUser = (id: number) => http({+ url: '/user',+ method: 'delete',+ params: {+ id+ }+ })++// Reset password+export const resetPassword = (id_list: number[]) => http({+ url: '/user/reset-pwd',+ method: 'post',+ data: {+ id_list+ }+ })++// Change password+export const changePassword = (data: ChangePwdAPIParams) => http({+ url: '/user/change-pwd',+ method: 'post',+ data+ })++// Import form+export const excelImport = (data: ImportVO[]) => http({+ url: '/user/excel',+ method: 'post',+ data+ })diff --git a/frontend/src/api/base/userRoleSetting.ts b/frontend/src/api/base/userRoleSetting.tsnew file mode 100644index 0000000..fadc64b--- /dev/null+++ b/frontend/src/api/base/userRoleSetting.ts@@ -0,0 +1,31 @@+import http from '@/utils/http/request'+import { UserRoleVO } from '@/types/Base/UserRoleSetting'++// Get all+export const getUserRoleAll = () => http({+ url: '/userrole/all',+ method: 'get'+ })++// Add a new form+export const addUserRole = (data: UserRoleVO) => http({+ url: '/userrole',+ method: 'post',+ data+ })++// Update form+export const updateUserRole = (data: UserRoleVO) => http({+ url: '/userrole',+ method: 'put',+ data+ })++// Delete form+export const deleteUserRole = (id: number) => http({+ url: '/userrole',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/base/warehouseSetting.ts b/frontend/src/api/base/warehouseSetting.tsnew file mode 100644index 0000000..2da30b7--- /dev/null+++ b/frontend/src/api/base/warehouseSetting.ts@@ -0,0 +1,124 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { GoodsLocationVO, WarehouseAreaVO, WarehouseVO } from '@/types/Base/Warehouse'++/**+ * Warehouse Setting+ */+// Find Data by Pagination+export const getWarehouseList = (data: PageConfigProps) => http({+ url: '/warehouse/list',+ method: 'post',+ data+ })++// Add a new warehouse+export const addWarehouse = (data: WarehouseVO) => http({+ url: '/warehouse',+ method: 'post',+ data+ })++// Update warehouse+export const updateWarehouse = (data: WarehouseVO) => http({+ url: '/warehouse',+ method: 'put',+ data+ })++// Delete warehouse+export const deleteWarehouse = (id: number) => http({+ url: '/warehouse',+ method: 'delete',+ params: {+ id+ }+ })++ // Get the combobox item with warehouse+export const getWarehouseSelect = () => http({+ url: '/warehouse/select-item',+ method: 'get',+ })++ // Excel Import+export const excelImport = (data: Array<WarehouseVO>) => http({+ url: '/warehouse/excel',+ method: 'post',+ data+})++ // Get the combobox item with warehouse area+export const getWarehouseAreaSelect = (warehouse_id: number) => http({+ url: '/warehousearea/all',+ method: 'get',+ params: {+ warehouse_id+ }+ })++/**+ * Warehouse Area Setting+ */+// Find Data by Pagination+export const getWarehouseAreaList = (data: PageConfigProps) => http({+ url: '/warehousearea/list',+ method: 'post',+ data+ })++// Add a new warehousearea+export const addWarehouseArea = (data: WarehouseAreaVO) => http({+ url: '/warehousearea',+ method: 'post',+ data+ })++// Update warehousearea+export const updateWarehouseArea = (data: WarehouseAreaVO) => http({+ url: '/warehousearea',+ method: 'put',+ data+ })++// Delete warehousearea+export const deleteWarehouseArea = (id: number) => http({+ url: '/warehousearea',+ method: 'delete',+ params: {+ id+ }+ })++/**+ * Goods Location Setting+ */+// Find Data by Pagination+export const getGoodsLocationList = (data: PageConfigProps) => http({+ url: '/goodslocation/list',+ method: 'post',+ data+ })++// Add a new goodslocation+export const addGoodsLocation = (data: GoodsLocationVO) => http({+ url: '/goodslocation',+ method: 'post',+ data+ })++// Update goodslocation+export const updateGoodsLocation = (data: GoodsLocationVO) => http({+ url: '/goodslocation',+ method: 'put',+ data+ })++// Delete goodslocation+export const deleteGoodsLocation = (id: number) => http({+ url: '/goodslocation',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/sys/login.ts b/frontend/src/api/sys/login.tsindex c8048a8..ec37606 100644--- a/frontend/src/api/sys/login.ts+++ b/frontend/src/api/sys/login.ts@@ -1,10 +1,17 @@import http from '@/utils/http/request'-import { LoginParams } from './model/userModel'+import { LoginParams } from '../../types/System/UserModel'-export const login = (data: LoginParams) => {- return http({+export const login = (data: LoginParams) => http({url: '/login',method: 'post',data})-}++// Get user menu dynamically+export const getUserAuthority = (userrole_id: number) => http({+ url: '/rolemenu/authority',+ method: 'get',+ params: {+ userrole_id+ }+ })diff --git a/frontend/src/api/wms/deliveryManagement.ts b/frontend/src/api/wms/deliveryManagement.tsnew file mode 100644index 0000000..8ac2d32--- /dev/null+++ b/frontend/src/api/wms/deliveryManagement.ts@@ -0,0 +1,221 @@+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'++// Get Pre shipment+export const getShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data+ })++// Get Pre shipment+export const getPreShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=0'+ }+ })++// Get new shipment+export const getNewShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=1'+ }+ })++// Get new shipment+export const getGoodsToBePicked = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=2'+ }+ })++// Get To Be Packaged+export const getToBePackaged = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_package'+ }+ })++// Get picked+export const getPicked = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=3'+ }+ })++// Get Packaged+export const getPackaged = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=4'+ }+ })++// Get To Be Weight+export const getToBeWeighed = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_weight'+ }+ })++// Get Weight+export const getWeighed = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=5'+ }+ })++// Get To Be Delivery+export const getToBeDelivery = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_delivery'+ }+ })++// Get Delivery+export const getDelivery = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=6'+ }+ })++// Get Sign In+export const getSignIn = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=7'+ }+ })++// Add+export const addShipment = (data: addRequestVO[]) => http({+ url: '/dispatchlist',+ method: 'post',+ data+ })++// Delete+export const delShipment = (dispatch_no: string) => http({+ url: '/dispatchlist',+ method: 'delete',+ params: {+ dispatch_no+ }+ })++// Get order confirmation information+export const getConfirmOrderInfoAndStock = (dispatch_no: string) => http({+ url: '/dispatchlist/confirm-check',+ method: 'get',+ params: {+ dispatch_no+ }+ })++// Confirm orders and create dispatchpicklist+export const confirmOrder = (data: ConfirmOrderVO[]) => http({+ url: '/dispatchlist/confirm-order',+ method: 'post',+ data+ })++// Confirm picking+export const confirmPicking = (dispatch_no: string) => http({+ url: '/dispatchlist/confirm-pick-dispatchlistno',+ method: 'put',+ params: {+ dispatch_no+ }+ })++// Pack+export const handlePackage = (data: PackageVO[]) => http({+ url: '/dispatchlist/package',+ method: 'post',+ data+ })++// Weigh+export const handleWeigh = (data: WeighVO[]) => http({+ url: '/dispatchlist/weight',+ method: 'post',+ data+ })++// Delivery+export const handleDelivery = (data: DeliveryVO[]) => http({+ url: '/dispatchlist/delivery',+ method: 'post',+ data+ })++// Sign in+export const handleSignIn = (data: SignInVO[]) => http({+ url: '/dispatchlist/sign',+ method: 'post',+ data+ })++// Undo to previous step by detail+export const cancelOrderByDetail = (id: number) => http({+ url: '/dispatchlist/cancel-order',+ method: 'put',+ params: {+ id+ }+ })++// Undo to previous step by dispatch+export const cancelOrderByDispatch = (data: CancleOrderVO) => http({+ url: '/dispatchlist/cancel-order',+ method: 'post',+ data+ })++// Set carrier+export const setCarrier = (data: SetCarrierVO[]) => http({+ url: '/dispatchlist/freightfee',+ method: 'post',+ data+ })++// Set carrier+export const viewInventoryDetails = (dispatch_id: number) => http({+ url: '/dispatchlist/pick-list',+ method: 'get',+ params: {+ dispatch_id+ }+ })diff --git a/frontend/src/api/wms/stockAsn.ts b/frontend/src/api/wms/stockAsn.tsnew file mode 100644index 0000000..57c7d1e--- /dev/null+++ b/frontend/src/api/wms/stockAsn.ts@@ -0,0 +1,76 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { StockAsnVO, SortingVo, PutawayVo } from '@/types/WMS/StockAsn'++export const getStockAsnList = (data: PageConfigProps) => http({+ url: '/asn/list',+ method: 'post',+ data+ })++export const addAsn = (data: StockAsnVO) => http({+ url: '/asn',+ method: 'post',+ data+ })++export const updateAsn = (data: StockAsnVO) => http({+ url: '/asn',+ method: 'put',+ data+ })++export const deleteAsn = (id: number) => http({+ url: '/asn',+ method: 'delete',+ params: {+ id+ }+ })++export const confirmAsn = (id: number) => http({+ url: `/asn/confirm/${ id }`,+ method: 'put'+ })+export const confirmAsnCancel = (id: number) => http({+ url: `/asn/confirm-cancel/${ id }`,+ method: 'put'+ })++export const unloadAsn = (id: number) => http({+ url: `/asn/unload/${ id }`,+ method: 'put'+ })+export const unloadAsnCancel = (id: number) => http({+ url: `/asn/unload-cancel/${ id }`,+ method: 'put'+ })++export const sortedAsn = (id: number) => http({+ url: `/asn/sorted/${ id }`,+ method: 'put'+ })+export const sortedAsnCancel = (id: number) => http({+ url: `/asn/sorted-cancel/${ id }`,+ method: 'put'+ })++export const sortingAsn = (data: SortingVo) => http({+ url: '/asn/sorting',+ method: 'put',+ data+ })++export const putawayAsn = (data: PutawayVo) => http({+ url: '/asn/putaway',+ method: 'put',+ data+ })++export const getSkuInfo = (id: number) => http({+ url: '/spu/sku',+ method: 'get',+ params: {+ sku_id: id+ }+ })diff --git a/frontend/src/api/wms/stockManagement.ts b/frontend/src/api/wms/stockManagement.tsnew file mode 100644index 0000000..506f7ed--- /dev/null+++ b/frontend/src/api/wms/stockManagement.ts@@ -0,0 +1,29 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'++// Get stock select+export const getStockSelectList = (data: PageConfigProps) => http({+ url: '/stock/select',+ method: 'post',+ data+ })++// Get sku select+export const getSkuSelectList = (data: PageConfigProps) => http({+ url: '/stock/sku-select',+ method: 'post',+ data+ })++ // Get stock location+export const getStockLocationList = (data: PageConfigProps) => http({+ url: '/stock/location-list',+ method: 'post',+ data+})+// Get stock+export const getStockList = (data: PageConfigProps) => http({+ url: '/stock/stock-list',+ method: 'post',+ data+})\ No newline at end of filediff --git a/frontend/src/api/wms/warehouseAdjust.ts b/frontend/src/api/wms/warehouseAdjust.tsnew file mode 100644index 0000000..c3513eb--- /dev/null+++ b/frontend/src/api/wms/warehouseAdjust.ts@@ -0,0 +1,50 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseAdjustVO } from '@/types/WarehouseWorking/WarehouseAdjust'++// Get list+export const getStockAdjustList = (data: PageConfigProps) => http({+ url: '/stockadjust/list',+ method: 'post',+ data+ })++// Get all+export const getStockAdjustAll = () => http({+ url: '/stockadjust/all',+ method: 'get'+ })++// Get one+export const getStockAdjustOne = (id: number) => http({+ url: '/stockadjust',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockAdjust = (data: WarehouseAdjustVO) => http({+ url: '/stockadjust',+ method: 'post',+ data+ })++// Delete form+export const deleteStockAdjust = (id: number) => http({+ url: '/stockadjust',+ method: 'delete',+ params: {+ id+ }+ })++ // Delete form+export const confirmStockAdjust = (id: number) => http({+ url: '/stockadjust/confirm',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseFreeze.ts b/frontend/src/api/wms/warehouseFreeze.tsnew file mode 100644index 0000000..8412c20--- /dev/null+++ b/frontend/src/api/wms/warehouseFreeze.ts@@ -0,0 +1,41 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'++// Get list+export const getStockFreezeList = (data: PageConfigProps) => http({+ url: '/stockfreeze/list',+ method: 'post',+ data+ })++// Get all+export const getStockFreezeAll = () => http({+ url: '/stockfreeze/all',+ method: 'get'+ })++// Get one+export const getStockFreezeOne = (id: number) => http({+ url: '/stockfreeze',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockFreeze = (data: WarehouseFreezeVO) => http({+ url: '/stockfreeze',+ method: 'post',+ data+ })++// Delete form+export const deleteStockFreeze = (id: number) => http({+ url: '/stockfreeze',+ method: 'delete',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseMove.ts b/frontend/src/api/wms/warehouseMove.tsnew file mode 100644index 0000000..15ede7c--- /dev/null+++ b/frontend/src/api/wms/warehouseMove.ts@@ -0,0 +1,50 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseMoveVO } from '@/types/WarehouseWorking/WarehouseMove'++// Get list+export const getStockMoveList = (data: PageConfigProps) => http({+ url: '/stockmove/list',+ method: 'post',+ data+ })++// Get all+export const getStockMoveAll = () => http({+ url: '/stockmove/all',+ method: 'get'+ })++// Get one+export const getStockMoveOne = (id: number) => http({+ url: '/stockmove',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockMove = (data: WarehouseMoveVO) => http({+ url: '/stockmove',+ method: 'post',+ data+ })++// Delete form+export const deleteStockMove = (id: number) => http({+ url: '/stockmove',+ method: 'delete',+ params: {+ id+ }+ })++// Confirm move+export const confirmMove = (id: number) => http({+ url: '/stockmove',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseProcessing.ts b/frontend/src/api/wms/warehouseProcessing.tsnew file mode 100644index 0000000..246a65a--- /dev/null+++ b/frontend/src/api/wms/warehouseProcessing.ts@@ -0,0 +1,66 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'++// Get list+export const getStockProcessList = (data: PageConfigProps) => http({+ url: '/stockprocess/list',+ method: 'post',+ data+ })++// Get all+export const getStockProcessAll = () => http({+ url: '/stockprocess/all',+ method: 'get'+ })++// Get one+export const getStockProcessOne = (id: number) => http({+ url: '/stockprocess',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockProcess = (data: WarehouseProcessingVO) => http({+ url: '/stockprocess',+ method: 'post',+ data+ })++// Update form+export const updateStockProcess = (data: WarehouseProcessingVO) => http({+ url: '/stockprocess',+ method: 'put',+ data+ })++// Delete form+export const deleteStockProcess = (id: number) => http({+ url: '/stockprocess',+ method: 'delete',+ params: {+ id+ }+ })++// Confirm process+export const confirmProcess = (id: number) => http({+ url: '/stockprocess/process-confirm',+ method: 'put',+ params: {+ id+ }+ })++// Confirm adjustment+export const confirmAdjustment = (id: number) => http({+ url: '/stockprocess/adjustment-confirm',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/api/wms/warehouseTaking.ts b/frontend/src/api/wms/warehouseTaking.tsnew file mode 100644index 0000000..d5c19aa--- /dev/null+++ b/frontend/src/api/wms/warehouseTaking.ts@@ -0,0 +1,54 @@+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'++// Get list+export const getStockTakingList = (data: PageConfigProps) => http({+ url: '/stocktaking/list',+ method: 'post',+ data+ })++// Get one+export const getStockTakingOne = (id: number) => http({+ url: '/stocktaking',+ method: 'get',+ params: {+ id+ }+ })++// Add a new form+export const addStockTaking = (data: WarehouseTakingVO) => http({+ url: '/stocktaking',+ method: 'post',+ data+ })++// Delete form+export const deleteStockTaking = (id: number) => http({+ url: '/stocktaking',+ method: 'delete',+ params: {+ id+ }+ })++// Confirm stock taking+export const confirmStockTaking = (data: WarehouseTakingVO) => http({+ url: '/stocktaking',+ method: 'put',+ data: {+ id: data.id,+ counted_qty: data.counted_qty+ }+ })++// Confirm stock adjust+export const confirmAdjustment = (id: number) => http({+ url: '/stocktaking/adjustment-confirm',+ method: 'put',+ params: {+ id+ }+ })diff --git a/frontend/src/assets/img/WMSTitle.png b/frontend/src/assets/img/WMSTitle.pngindex fc5c737..be808e2 100644Binary files a/frontend/src/assets/img/WMSTitle.png and b/frontend/src/assets/img/WMSTitle.png differdiff --git a/frontend/src/assets/img/WMSTitleBig.png b/frontend/src/assets/img/WMSTitleBig.pngnew file mode 100644index 0000000..ff7f7abBinary files /dev/null and b/frontend/src/assets/img/WMSTitleBig.png differdiff --git a/frontend/src/assets/img/gitee.png b/frontend/src/assets/img/gitee.pngnew file mode 100644index 0000000..cc143a7Binary files /dev/null and b/frontend/src/assets/img/gitee.png differdiff --git a/frontend/src/assets/img/github.png b/frontend/src/assets/img/github.pngnew file mode 100644index 0000000..b96155aBinary files /dev/null and b/frontend/src/assets/img/github.png differdiff --git a/frontend/src/assets/img/loginLeft.png b/frontend/src/assets/img/loginLeft.pngindex 250412c..1f96509 100644Binary files a/frontend/src/assets/img/loginLeft.png and b/frontend/src/assets/img/loginLeft.png differdiff --git a/frontend/src/assets/img/logo.png b/frontend/src/assets/img/logo.pngnew file mode 100644index 0000000..9476e3cBinary files /dev/null and b/frontend/src/assets/img/logo.png differdiff --git a/frontend/src/assets/img/webLogoMini.png b/frontend/src/assets/img/webLogoMini.pngnew file mode 100644index 0000000..cbe2a93Binary files /dev/null and b/frontend/src/assets/img/webLogoMini.png differdiff --git a/frontend/src/assets/warehouse.json b/frontend/src/assets/warehouse.jsonnew file mode 100644index 0000000..b2b3059--- /dev/null+++ b/frontend/src/assets/warehouse.json@@ -0,0 +1 @@+{"v":"5.6.5","fr":60,"ip":0,"op":181,"w":1579,"h":1370,"nm":"MovingTrolleyWithMan","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Group 71","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[789.309,684.93,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[1578.619,1369.86],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"rear_tyre_cast","parent":1,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":61,"s":[40]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":64,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":116,"s":[0]},{"t":120,"s":[40]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[56.828,396.001,0],"to":[1.167,-0.542,0],"ti":[-0.75,1.833,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[63.828,392.751,0],"to":[0.75,-1.833,0],"ti":[1.75,2.042,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":40,"s":[61.328,385.001,0],"to":[-1.75,-2.042,0],"ti":[2.958,1,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[53.328,380.501,0],"to":[-2.958,-1,0],"ti":[1.625,0.25,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[43.578,379.001,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":100,"s":[43.578,379.001,0],"to":[1.625,0.25,0],"ti":[-2.958,-1,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":120,"s":[53.328,380.501,0],"to":[2.958,1,0],"ti":[-1.75,-2.042,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":140,"s":[61.328,385.001,0],"to":[1.75,2.042,0],"ti":[0.75,-1.833,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":160,"s":[63.828,392.751,0],"to":[-0.75,1.833,0],"ti":[1.167,-0.542,0]},{"t":180,"s":[56.828,396.001,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"rear_tyre_cast Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"rear_tyre_cast Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"front_tyre_cast","parent":1,"sr":1,"ks":{"o":{"a":0,"k":40,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-152.172,391.001,0],"to":[0.042,0.5,0],"ti":[-1.042,0.792,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":30,"s":[-151.922,394.001,0],"to":[0.626,-0.476,0],"ti":[-1.514,1.924,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[-147.566,392.946,0],"to":[1.005,-1.278,0],"ti":[-0.083,0.881,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":80,"s":[-145.922,386.251,0],"to":[0.208,-2.208,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-150.672,380.751,0],"to":[0,0,0],"ti":[-0.083,0.881,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":100,"s":[-145.922,386.251,0],"to":[0.208,-2.208,0],"ti":[-1.514,1.924,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":120,"s":[-146.566,390.946,0],"to":[0.502,-0.638,0],"ti":[1.53,-0.896,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":130,"s":[-149.126,394.037,0],"to":[-1.534,0.899,0],"ti":[-0.522,0.396,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":140,"s":[-151.672,393.501,0],"to":[0.626,-0.476,0],"ti":[0.083,0.417,0]},{"t":180,"s":[-152.172,391.001,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"front_tyre_cast Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"front_tyre_cast Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"trolley","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-41.063,249.989,0],"to":[-3,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-59.063,249.989,0],"to":[0,0,0],"ti":[-3,0,0]},{"t":180,"s":[-41.063,249.989,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[281.21,312.557],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.543,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.543,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.543,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.543,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.554,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.554,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.554,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.554,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.027,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.027,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.027,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.027,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.217,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.217,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.217,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.217,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.227,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.227,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.227,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.227,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[49.7,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[59.7,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[59.7,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[49.7,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.87,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.87,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.87,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.87,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.88,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.88,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.88,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.88,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.353,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.353,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.353,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.353,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.543,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.543,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.543,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.543,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.554,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.554,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.554,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.554,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.027,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.027,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.027,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.027,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.217,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.217,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.217,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.217,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.227,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.227,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.227,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.227,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[49.7,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[59.7,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[59.7,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[49.7,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.87,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.87,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.87,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.87,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":21,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.88,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.88,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.88,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.88,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.353,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.353,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.353,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.353,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.543,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.543,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.543,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.543,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":24,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.554,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.554,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.554,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.554,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":25,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[48.027,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[58.027,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[58.027,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[48.027,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":26,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.217,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.217,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.217,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.217,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":27,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[50.227,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[60.227,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[60.227,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[50.227,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":28,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[49.7,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[59.7,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[59.7,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[49.7,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":29,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.87,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.87,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.87,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.87,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":30,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.88,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.88,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.88,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.88,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":31,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[46.353,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[56.353,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[56.353,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[46.353,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":32,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.645,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.645,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.645,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.645,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":33,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.634,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.634,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.634,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.634,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":34,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-72.161,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-61.161,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-61.161,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-79.161,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":35,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.971,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.971,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.971,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.971,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":36,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.96,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.96,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.96,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.96,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":37,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-70.488,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-59.488,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-59.488,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-77.488,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":38,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.318,-147.059,0],"to":[2.667,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-57.318,-147.059,0],"to":[1.833,0,0],"ti":[3.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.318,-147.059,0],"to":[-3.833,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.318,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":39,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.307,-147.059,0],"to":[2.667,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-57.307,-147.059,0],"to":[1.833,0,0],"ti":[3.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.307,-147.059,0],"to":[-3.833,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.307,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":40,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.835,-124.504,0],"to":[2.667,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-57.835,-124.504,0],"to":[1.833,0,0],"ti":[3.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.835,-124.504,0],"to":[-3.833,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.835,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":41,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.645,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.645,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.645,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.645,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":186,"st":0,"bm":0},{"ddd":0,"ind":42,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-71.634,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-60.634,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-60.634,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-78.634,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":43,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-72.161,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-61.161,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-61.161,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-79.161,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":44,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.971,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.971,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.971,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.971,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":45,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-69.96,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-58.96,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-58.96,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-76.96,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":46,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-70.488,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-59.488,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-59.488,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-77.488,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":47,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.318,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-62.318,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.318,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.318,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":48,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.307,-147.059,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-62.307,-147.059,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.307,-147.059,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.307,-147.059,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":49,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-73.835,-124.504,0],"to":[1.833,0,0],"ti":[-1.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-62.835,-124.504,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-62.835,-124.504,0],"to":[-3,0,0],"ti":[3,0,0]},{"t":100,"s":[-80.835,-124.504,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":50,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.645,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.645,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.645,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.645,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":51,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.634,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.634,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.634,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.634,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":52,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-79.161,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-69.161,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-69.161,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-79.161,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":53,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.971,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.971,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.971,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.971,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":54,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.96,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.96,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.96,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.96,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":55,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-77.488,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-67.488,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-67.488,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-77.488,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":56,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.318,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.318,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.318,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.318,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":57,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.307,-83.356,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.307,-83.356,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.307,-83.356,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.307,-83.356,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":58,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.835,-60.802,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.835,-60.802,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.835,-60.802,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.835,-60.802,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":59,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.645,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.645,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.645,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.645,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":60,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.634,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.634,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.634,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.634,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":61,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-79.161,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-69.161,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-69.161,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-79.161,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":62,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.971,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.971,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.971,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.971,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":63,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.96,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.96,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.96,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.96,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":64,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-77.488,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-67.488,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-67.488,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-77.488,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":65,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.318,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.318,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.318,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.318,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":66,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.307,-19.654,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.307,-19.654,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.307,-19.654,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.307,-19.654,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":67,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.835,2.9,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.835,2.9,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.835,2.9,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.835,2.9,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":68,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.645,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.645,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.645,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.645,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":69,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-78.634,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-68.634,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-68.634,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-78.634,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":70,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-79.161,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-69.161,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-69.161,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-79.161,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":71,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.971,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.971,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.971,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.971,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":72,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-76.96,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-66.96,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-66.96,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-76.96,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":73,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-77.488,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-67.488,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-67.488,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-77.488,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":74,"ty":4,"nm":"Rectangle 162","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.318,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.318,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.318,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.318,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[23.848,5.029],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 162","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":75,"ty":4,"nm":"Rectangle 161","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.307,44.048,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[-70.307,44.048,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.307,44.048,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":100,"s":[-80.307,44.048,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[31.797,6.706],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 161","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":76,"ty":4,"nm":"Rectangle 160","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-80.835,66.603,0],"to":[1.667,0,0],"ti":[-1.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[-70.835,66.603,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[-70.835,66.603,0],"to":[-1.667,0,0],"ti":[1.667,0,0]},{"t":105,"s":[-80.835,66.603,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[123.54,63.549],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":7,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":65.882,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 160","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":77,"ty":4,"nm":"Path 366","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":4,"ix":10},"p":{"a":0,"k":[115.309,33.596,0],"ix":2},"a":{"a":0,"k":[5.023,16.764,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,0],[10.041,0.001],[10.045,33.528],[0.004,33.527]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 366 Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,0],[10.041,0.001],[10.045,33.528],[0.004,33.527]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 366 Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":78,"ty":4,"nm":"Path 353","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[127.665,0.092,0],"ix":2},"a":{"a":0,"k":[12.94,99.542,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.141,0.827],[1.159,0.58],[0.972,-0.411],[0.381,-0.985],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[-0.14,-1.29],[-0.97,-0.414],[-0.972,0.411],[0,0],[0,0],[0,0],[0,0],[0,0],[0.37,-0.753]],"v":[[25.822,3.158],[23.739,0.158],[21.44,0.642],[18.83,5.589],[4.184,38.153],[0,199.085],[6.694,199.085],[9.204,38.496],[25.471,5.589]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 353","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":79,"ty":4,"nm":"Path 355","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-4.777,108.308,0],"ix":2},"a":{"a":0,"k":[135.71,8.929,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[0,17.858],[0,2.771],[271.42,0],[271.42,8.975],[4.941,10.314],[4.941,17.858]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 355","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":80,"ty":4,"nm":"Path 354","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-4.761,93.977,0],"ix":2},"a":{"a":0,"k":[135.726,8.172,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[0,16.345],[22.593,2.096],[266.508,0],[271.453,13.702]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 354","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":81,"ty":4,"nm":"Path 345","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[122.146,-0.085,0],"ix":2},"a":{"a":0,"k":[15.788,98.043,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.142,0.827],[1.159,0.58],[0.972,-0.411],[0.381,-0.985],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[-0.14,-1.29],[-0.97,-0.414],[-0.972,0.411],[0,0],[0,0],[0,0],[0,0],[0,0],[0.37,-0.753]],"v":[[30.006,3.512],[31.275,0.095],[30.44,1.138],[26.849,4.376],[4.184,41.859],[0,196.086],[6.694,196.086],[11.152,41.859],[29.655,5.943]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 345","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":82,"ty":4,"nm":"Path 320","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.359,121.917,0],"ix":2},"a":{"a":0,"k":[19.658,15.521,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.17,-0.019],[-0.513,0.833],[0,0]],"o":[[0,0],[0.471,0.849],[1.169,0.019],[0,0],[0,0]],"v":[[0,1.871],[15.475,29.617],[18.164,31.041],[20.924,29.705],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 320","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":83,"ty":4,"nm":"Ellipse 111","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[98.786,137.573,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,23.694],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 111","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":84,"ty":4,"nm":"Ellipse 110","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[98.786,137.573,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,37.412],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 110","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":85,"ty":4,"nm":"Path 319","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-99.589,121.072,0],"ix":2},"a":{"a":0,"k":[19.658,14.926,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.169,-0.018],[-0.513,0.802],[0,0]],"o":[[0,0],[0.47,0.817],[1.17,0.018],[0,0],[0,0]],"v":[[0,1.799],[15.475,28.483],[18.164,29.852],[20.924,28.567],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 319","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":86,"ty":4,"nm":"Ellipse 109","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-101.161,136.128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,22.786],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 109","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":87,"ty":4,"nm":"Ellipse 108","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-101.161,136.128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 108","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":88,"ty":4,"nm":"Path 315","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-77.965,114.776,0],"ix":2},"a":{"a":0,"k":[19.658,14.926,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.169,-0.018],[-0.513,0.802],[0,0]],"o":[[0,0],[0.47,0.817],[1.17,0.018],[0,0],[0,0]],"v":[[0,1.799],[15.475,28.483],[18.164,29.852],[20.924,28.567],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 315","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":89,"ty":4,"nm":"Path 314","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-77.965,114.776,0],"ix":2},"a":{"a":0,"k":[19.658,14.926,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.169,-0.018],[-0.513,0.802],[0,0]],"o":[[0,0],[0.47,0.817],[1.17,0.018],[0,0],[0,0]],"v":[[0,1.799],[15.475,28.483],[18.164,29.852],[20.924,28.567],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 314","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":90,"ty":4,"nm":"Ellipse 107","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,22.786],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 107","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":91,"ty":4,"nm":"Ellipse 106","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,22.786],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 106","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":92,"ty":4,"nm":"Ellipse 105","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 105","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":93,"ty":4,"nm":"Ellipse 104","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-79.538,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 104","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":94,"ty":4,"nm":"Path 313","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[85.812,115.37,0],"ix":2},"a":{"a":0,"k":[19.658,15.521,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.17,-0.019],[-0.513,0.833],[0,0]],"o":[[0,0],[0.47,0.849],[1.17,0.019],[0,0],[0,0]],"v":[[0,1.871],[15.475,29.617],[18.164,31.041],[20.924,29.705],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 313","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":95,"ty":4,"nm":"Path 312","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[85.812,115.37,0],"ix":2},"a":{"a":0,"k":[19.658,15.521,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.17,-0.019],[-0.513,0.833],[0,0]],"o":[[0,0],[0.47,0.849],[1.17,0.019],[0,0],[0,0]],"v":[[0,1.871],[15.475,29.617],[18.164,31.041],[20.924,29.705],[39.316,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 312","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":96,"ty":4,"nm":"Ellipse 103","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.239,131.026,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,23.694],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 103","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":97,"ty":4,"nm":"Ellipse 102","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.239,131.026,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[29.88,23.694],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.396078431373,0.380392156863,0.490196078431,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 102","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":98,"ty":4,"nm":"Ellipse 101","parent":4,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.239,129.832,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,35.979],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 101","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":99,"ty":4,"nm":"Ellipse 100","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[84.24,131.026,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[47.179,37.412],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 100","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":100,"ty":4,"nm":"holding_shoulder","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-5]},{"t":180,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[158.424,105.538,0],"to":[-0.958,1.042,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[152.674,111.788,0],"to":[0,0,0],"ti":[-0.958,1.042,0]},{"t":180,"s":[158.424,105.538,0]}],"ix":2},"a":{"a":0,"k":[17.288,17.773,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.818,-1.971],[0.612,-0.772],[0.662,-1.152],[2.068,-2.067],[0.1,-0.417],[-0.371,-0.437],[0,0],[-3.333,-0.269],[-1.191,0.352],[-0.726,0.559],[-1.666,1.581],[0.02,2.157],[0.426,1.827],[2.891,5.107],[2.978,-1.709]],"o":[[-0.85,0.528],[-0.77,1.12],[-1.419,2.522],[-0.335,0.283],[-0.013,0.563],[0,0],[3.346,0.282],[1.238,0.096],[0.851,-0.363],[2.008,-1.203],[1.666,-1.581],[0.03,-1.872],[-1.472,-5.76],[-1.412,-2.49],[-2.978,1.709]],"v":[[11.284,6.7],[9.075,8.665],[7.483,12.377],[0.67,17.868],[0.001,18.943],[0.556,20.492],[10.554,35.519],[20.406,34.072],[24.113,34.226],[26.489,32.837],[32.787,29.913],[34.573,23.852],[33.978,18.284],[25.003,2.975],[19.85,0.742]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_shoulder","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":101,"ty":4,"nm":"holding_arm","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-36]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-31]},{"t":180,"s":[-36]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[132.911,124.62,0],"to":[-1.333,1.25,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[124.911,132.12,0],"to":[0,0,0],"ti":[-1.333,1.25,0]},{"t":180,"s":[132.911,124.62,0]}],"ix":2},"a":{"a":0,"k":[27.027,9.643,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.244,0.03],[0,0],[0.03,-5.271],[5.244,-0.03],[0,0],[-0.03,5.271]],"o":[[0,0],[5.244,-0.03],[-0.03,5.271],[0,0],[-5.244,0.03],[0.03,-5.271]],"v":[[9.55,0.199],[44.612,0],[54.054,9.49],[44.505,19.088],[9.442,19.286],[0,9.796]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_arm Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.244,0.03],[0,0],[0.03,-5.271],[5.244,-0.03],[0,0],[-0.03,5.271]],"o":[[0,0],[5.244,-0.03],[-0.03,5.271],[0,0],[-5.244,0.03],[0.03,-5.271]],"v":[[9.55,0.199],[44.612,0],[54.054,9.49],[44.505,19.088],[9.442,19.286],[0,9.796]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_arm Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":102,"ty":4,"nm":"holding_hand","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-7]},{"t":180,"s":[-30]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[106.048,144.62,0],"to":[-2.458,0.917,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[91.298,150.12,0],"to":[0,0,0],"ti":[-2.458,0.917,0]},{"t":180,"s":[106.048,144.62,0]}],"ix":2},"a":{"a":0,"k":[19.679,12.241,0],"ix":1},"s":{"a":0,"k":[112,112,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.592,0.001],[1.65,1.556],[1.875,-0.27],[1.021,-0.935],[0,0],[0.415,-1.089],[-0.135,-0.691],[-1.079,-0.344],[-1.193,0.428],[-0.944,-1.12],[0.002,-0.63],[1.31,-0.161],[1.297,-0.175],[0.131,-0.116],[0.027,-0.172],[-0.636,-0.63],[-0.831,-0.288],[-1.092,-0.052],[-2.114,0.905],[-2.937,0.199],[-2.874,1.088],[-1.291,3.016],[0.032,0.299],[0.264,0.153],[4.307,1.964]],"o":[[-2.411,1.453],[-2.331,0.004],[-1.332,-1.235],[-1.255,0.18],[0,0],[-0.907,0.69],[-0.149,0.729],[0.153,1.226],[1.079,0.344],[1.483,-0.505],[0.389,0.415],[-0.091,1.389],[-1.31,0.161],[-0.156,-0.01],[-0.131,0.116],[-0.227,0.996],[0.631,0.618],[0.958,0.461],[2.168,0],[2.847,-1.209],[2.937,-0.199],[2.874,-1.088],[0.148,-0.283],[-0.089,-0.315],[-3.752,-2.889],[0,0]],"v":[[29.088,0.675],[22.651,3.229],[15.544,2.558],[10.985,0.031],[7.6,2.133],[2.153,7.152],[0.117,9.892],[0.097,12.046],[1.625,15.039],[5.162,13.965],[9.101,14.963],[9.701,16.585],[6.822,19.148],[2.997,19.112],[2.548,19.276],[2.301,19.726],[2.957,22.337],[5.169,23.708],[8.268,24.483],[14.636,22.133],[23.415,20.483],[32.202,19.031],[39.171,12.767],[39.349,11.868],[38.803,11.143],[30.733,3.309]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"holding_hand","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":103,"ty":4,"nm":"upper_body","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":90,"s":[-4]},{"t":180,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[235.526,108.691,0],"to":[-1,0.333,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[229.526,110.691,0],"to":[0,0,0],"ti":[-1,0.333,0]},{"t":180,"s":[235.526,108.691,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[143.213,188.336],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":104,"ty":4,"nm":"Path 332","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[39.743,-4.147,0],"ix":2},"a":{"a":0,"k":[18.356,22.253,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.934,-1.331],[-1.459,-1.626],[-1.466,-1.92],[-1.606,-1.715],[-1.619,-3.142],[4.645,-4.357],[0.766,-0.219],[0.674,0.784],[0.689,0.749],[2.321,0.221],[2.308,-0.151],[0.459,0.212],[0.185,0.355],[-0.957,5.03],[0,0],[-0.894,2.05],[-2.289,-0.512]],"o":[[1.879,1.167],[1.519,1.875],[1.466,1.92],[2.443,2.598],[-3.965,4.933],[-0.518,0.583],[-1.055,0.108],[-0.723,-0.717],[-1.624,-1.602],[-2.302,-0.214],[-0.507,0.057],[-0.342,-0.224],[-2.677,-4.403],[0,0],[0.319,-2.199],[0.83,-1.696],[2.289,0.512]],"v":[[17.164,5.078],[22.196,9.289],[26.044,15.388],[30.997,20.405],[36.712,29.308],[23.782,43.26],[21.815,44.488],[19.044,43.407],[17.123,41.045],[11.013,38.223],[4.087,38.127],[2.608,37.89],[1.805,37.007],[0.921,22.044],[3.109,10.524],[4.937,4.124],[9.902,0.06]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 332","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":105,"ty":4,"nm":"Path 331","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.843,-79.028,0],"ix":2},"a":{"a":0,"k":[24.939,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.06,1.229],[-0.183,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.897,-4.16],[-2.195,3.132],[0.167,2.112],[2.436,1.926],[0,0],[1.215,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.194,-0.645],[-0.174,-0.915],[-0.576,-1.594],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.042,-0.466],[0.542,-0.922],[4.303,1.037],[4.437,0.243],[3.216,-2.182],[1.231,-1.766],[-0.241,-3.046],[0,0],[-0.967,-0.851],[-1.707,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.495,0.476],[-0.187,0.909],[0.308,1.664],[0.957,2.656],[0.763,0.563],[1.586,-0.032]],"v":[[12.697,25.198],[12.912,23.828],[15.943,23.419],[29.221,23.758],[39.541,30.279],[47.725,22.241],[49.86,16.347],[44.506,9.096],[37.145,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.093,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.254],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 331","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":106,"ty":4,"nm":"Path 329","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.338,44.927,0],"ix":2},"a":{"a":0,"k":[26.268,44.068,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.6,1.318],[0,0],[-1.071,-1.382],[-1.529,-4.032],[0.415,-3.174],[0.634,-1.534],[1.477,-2.76],[1.542,-1.898],[5.009,-4.741],[0.797,-2.394],[3.46,-3.264],[1.33,-0.883],[2.37,0.044],[0.947,0.398],[0.248,2.496],[-0.973,2.079],[-5.709,4.864],[-2.53,3.539],[-1.119,2.537],[-1.118,3.302],[-0.475,1.389],[0.89,1.197],[0.964,0.378],[0.696,3.859],[-1.328,1.74],[-1.732,1.342]],"o":[[0,0],[1.178,1.28],[2.635,3.47],[1.191,2.989],[-0.278,1.627],[-1.004,2.948],[-1.233,2.094],[-4.245,5.379],[-1.874,1.773],[-1.506,4.422],[-1.113,1.125],[-1.992,1.229],[-1.034,0.006],[-2.369,-1.075],[-0.219,-2.268],[3.145,-6.662],[3.346,-2.848],[1.713,-2.212],[1.272,-3.258],[0.468,-1.402],[0.475,-1.389],[-0.667,-0.765],[-3.647,-1.766],[-0.279,-2.137],[1.32,-1.717],[1.586,-1.37]],"v":[[35.488,0],[40.969,5.99],[44.396,9.933],[50.673,21.241],[52.44,30.592],[51.068,35.347],[47.34,43.923],[43.171,49.919],[29.271,65.119],[25.797,72.159],[17.251,83.295],[13.577,86.316],[6.885,88.133],[3.88,87.538],[0.059,81.349],[1.21,74.719],[18.141,60.306],[26.58,50.335],[30.844,43.187],[32.737,32.774],[34.551,28.723],[34.297,24.493],[31.814,22.752],[23.388,14.848],[25.021,8.813],[29.619,4.205]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 329","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":107,"ty":4,"nm":"Path 327","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-19.409,27.884,0],"ix":2},"a":{"a":0,"k":[52.197,66.284,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.062,-1.134],[4.44,-0.113],[0.571,0.259],[0.173,0.352],[0.764,2.414],[1.131,0.275],[0.609,-0.685],[0.628,-0.668],[2.804,-2.08],[0.495,-0.314],[0.544,-0.144],[5.202,-2.284],[-4.39,-10.08],[-1.673,-4.947],[-0.047,-11.526],[2.677,-7.462],[0.167,-1.754],[-1.506,-1.05],[-1.04,-0.093],[-4.551,1.011],[-12.414,1.51],[0,0],[-1.356,0.607],[2.369,3.482],[0.957,1.766],[-1.64,1.222],[-0.161,4.045],[0.567,11.298],[-0.09,2.347],[-1.031,3.872],[0,0],[2.991,0.717],[2.951,0.877],[6.311,-0.422],[0.429,-0.203],[0.087,-1.562],[2.931,-2.029],[2.697,-2.31]],"o":[[-1.465,-4.009],[-0.621,0.113],[-0.324,-0.236],[-1.278,-2.206],[-0.335,-1.069],[-0.91,-0.224],[-0.54,0.735],[-2.677,2.266],[-0.462,0.339],[-0.482,0.281],[-5.443,1.694],[1.874,10.777],[2.088,4.8],[3.708,10.963],[0,7.885],[-0.602,1.69],[-0.167,1.754],[0.872,0.55],[4.625,0.64],[12.2,-2.701],[0,0],[1.493,-0.1],[3.808,-1.99],[-1.131,-1.67],[-0.957,-1.766],[3.346,-2.496],[0.446,-11.315],[-0.17,-2.343],[0.234,-3.981],[0,0],[-1.653,-2.496],[-2.991,-0.717],[-6.023,-1.792],[-0.479,0.008],[-1.419,0.774],[-0.201,3.462],[-2.931,2.029],[-0.948,0.684]],"v":[[50.735,21.698],[40.824,15.157],[38.99,14.933],[38.234,14.037],[35.162,7.087],[33.234,4.482],[30.785,5.506],[29.032,7.612],[18.866,9.89],[17.527,10.978],[15.981,11.618],[0,17.589],[8.178,49.429],[14.302,63.88],[18.217,98.1],[15.54,121.498],[14.034,126.618],[15.921,131.405],[18.832,132.384],[32.665,130.848],[69.728,125.088],[90.541,122.529],[94.851,121.46],[96.651,110.509],[92.964,105.703],[93.573,100.231],[96.076,89.063],[95.895,55.144],[95.775,48.104],[98.07,36.354],[104.395,12.546],[96.584,7.746],[87.516,5.941],[69.775,0.028],[68.396,0.348],[67.111,4.642],[61.316,13.019],[52.328,18.831]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 327","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":108,"ty":4,"nm":"Ellipse 112","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.811,-60.816,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[42.162,40.32],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 112","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":109,"ty":4,"nm":"Path 326","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-24.742,-72.686,0],"ix":2},"a":{"a":0,"k":[24.942,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.047,1.229],[-0.184,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.89,-4.16],[-2.192,3.135],[0.167,2.112],[2.443,1.933],[0,0],[1.217,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.196,-0.646],[-0.174,-0.915],[-0.576,-1.6],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.047,-0.466],[0.542,-0.915],[4.303,1.037],[4.437,0.243],[3.219,-2.179],[1.231,-1.76],[-0.241,-3.046],[0,0],[-0.97,-0.851],[-1.7,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.498,0.475],[-0.187,0.909],[0.308,1.664],[0.957,2.65],[0.763,0.563],[1.613,-0.032]],"v":[[12.711,25.198],[12.918,23.828],[15.95,23.419],[29.228,23.758],[39.547,30.279],[47.732,22.241],[49.867,16.353],[44.513,9.096],[37.151,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.099,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.26],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 326","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":110,"ty":4,"nm":"Path 321","parent":103,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-17.258,-24.946,0],"ix":2},"a":{"a":0,"k":[24.219,27.249,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.09,-2.654],[1.231,-4.006],[-4.39,-4.736],[-10.677,-0.483],[-1.487,0.445],[-0.982,0.994],[-0.703,4.422],[0.274,4.461],[0.345,0.862],[0.749,0.586],[2.807,1.516],[0.77,1.107],[0.139,1.007],[0,0],[0.68,1.031],[2.55,0.096],[0,0],[2.844,-0.55],[-0.482,-2.125]],"o":[[-0.489,4.16],[-1.847,6.048],[7.147,7.601],[1.553,0.128],[1.325,-0.516],[3.293,-3.168],[0.703,-4.422],[0,-0.923],[-0.448,-0.82],[-2.374,-2.086],[-1.205,-0.64],[-0.528,-0.882],[0,0],[-0.153,-1.211],[-1.519,-1.958],[0,0],[-2.911,-0.109],[-2.677,0.506],[0.697,2.57]],"v":[[5.574,13.023],[0.535,24.543],[6.264,41.823],[34.118,54.456],[38.722,53.976],[42.222,51.685],[47.991,39.711],[48.151,26.329],[47.629,23.628],[45.816,21.497],[38.019,16.076],[34.753,13.689],[33.743,10.828],[32.879,6.63],[31.614,3.225],[24.634,0.902],[15.265,0.55],[5.681,0.191],[4.39,5.164]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 321","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":111,"ty":4,"nm":"Path 84","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[39.743,-4.147,0],"ix":2},"a":{"a":0,"k":[18.356,22.253,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.934,-1.331],[-1.459,-1.626],[-1.466,-1.92],[-1.606,-1.715],[-1.619,-3.142],[4.645,-4.357],[0.766,-0.219],[0.674,0.784],[0.689,0.749],[2.321,0.221],[2.308,-0.151],[0.459,0.212],[0.185,0.355],[-0.957,5.03],[0,0],[-0.894,2.05],[-2.289,-0.512]],"o":[[1.879,1.167],[1.519,1.875],[1.466,1.92],[2.443,2.598],[-3.965,4.933],[-0.518,0.583],[-1.055,0.108],[-0.723,-0.717],[-1.624,-1.602],[-2.302,-0.214],[-0.507,0.057],[-0.342,-0.224],[-2.677,-4.403],[0,0],[0.319,-2.199],[0.83,-1.696],[2.289,0.512]],"v":[[17.164,5.078],[22.196,9.289],[26.044,15.388],[30.997,20.405],[36.712,29.308],[23.782,43.26],[21.815,44.488],[19.044,43.407],[17.123,41.045],[11.013,38.223],[4.087,38.127],[2.608,37.89],[1.805,37.007],[0.921,22.044],[3.109,10.524],[4.937,4.124],[9.902,0.06]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 84","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":112,"ty":4,"nm":"Path 82","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.843,-79.028,0],"ix":2},"a":{"a":0,"k":[24.939,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.06,1.229],[-0.183,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.897,-4.16],[-2.195,3.132],[0.167,2.112],[2.436,1.926],[0,0],[1.215,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.194,-0.645],[-0.174,-0.915],[-0.576,-1.594],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.042,-0.466],[0.542,-0.922],[4.303,1.037],[4.437,0.243],[3.216,-2.182],[1.231,-1.766],[-0.241,-3.046],[0,0],[-0.967,-0.851],[-1.707,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.495,0.476],[-0.187,0.909],[0.308,1.664],[0.957,2.656],[0.763,0.563],[1.586,-0.032]],"v":[[12.697,25.198],[12.912,23.828],[15.943,23.419],[29.221,23.758],[39.541,30.279],[47.725,22.241],[49.86,16.347],[44.506,9.096],[37.145,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.093,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.254],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 82","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":113,"ty":4,"nm":"Path 80","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[45.338,44.927,0],"ix":2},"a":{"a":0,"k":[26.268,44.068,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.6,1.318],[0,0],[-1.071,-1.382],[-1.529,-4.032],[0.415,-3.174],[0.634,-1.534],[1.477,-2.76],[1.542,-1.898],[5.009,-4.741],[0.797,-2.394],[3.46,-3.264],[1.33,-0.883],[2.37,0.044],[0.947,0.398],[0.248,2.496],[-0.973,2.079],[-5.709,4.864],[-2.53,3.539],[-1.119,2.537],[-1.118,3.302],[-0.475,1.389],[0.89,1.197],[0.964,0.378],[0.696,3.859],[-1.328,1.74],[-1.732,1.342]],"o":[[0,0],[1.178,1.28],[2.635,3.47],[1.191,2.989],[-0.278,1.627],[-1.004,2.948],[-1.233,2.094],[-4.245,5.379],[-1.874,1.773],[-1.506,4.422],[-1.113,1.125],[-1.992,1.229],[-1.034,0.006],[-2.369,-1.075],[-0.219,-2.268],[3.145,-6.662],[3.346,-2.848],[1.713,-2.212],[1.272,-3.258],[0.468,-1.402],[0.475,-1.389],[-0.667,-0.765],[-3.647,-1.766],[-0.279,-2.137],[1.32,-1.717],[1.586,-1.37]],"v":[[35.488,0],[40.969,5.99],[44.396,9.933],[50.673,21.241],[52.44,30.592],[51.068,35.347],[47.34,43.923],[43.171,49.919],[29.271,65.119],[25.797,72.159],[17.251,83.295],[13.577,86.316],[6.885,88.133],[3.88,87.538],[0.059,81.349],[1.21,74.719],[18.141,60.306],[26.58,50.335],[30.844,43.187],[32.737,32.774],[34.551,28.723],[34.297,24.493],[31.814,22.752],[23.388,14.848],[25.021,8.813],[29.619,4.205]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 80","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":114,"ty":4,"nm":"Path 78","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-19.409,27.884,0],"ix":2},"a":{"a":0,"k":[52.197,66.284,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.062,-1.134],[4.44,-0.113],[0.571,0.259],[0.173,0.352],[0.764,2.414],[1.131,0.275],[0.609,-0.685],[0.628,-0.668],[2.804,-2.08],[0.495,-0.314],[0.544,-0.144],[5.202,-2.284],[-4.39,-10.08],[-1.673,-4.947],[-0.047,-11.526],[2.677,-7.462],[0.167,-1.754],[-1.506,-1.05],[-1.04,-0.093],[-4.551,1.011],[-12.414,1.51],[0,0],[-1.356,0.607],[2.369,3.482],[0.957,1.766],[-1.64,1.222],[-0.161,4.045],[0.567,11.298],[-0.09,2.347],[-1.031,3.872],[0,0],[2.991,0.717],[2.951,0.877],[6.311,-0.422],[0.429,-0.203],[0.087,-1.562],[2.931,-2.029],[2.697,-2.31]],"o":[[-1.465,-4.009],[-0.621,0.113],[-0.324,-0.236],[-1.278,-2.206],[-0.335,-1.069],[-0.91,-0.224],[-0.54,0.735],[-2.677,2.266],[-0.462,0.339],[-0.482,0.281],[-5.443,1.694],[1.874,10.777],[2.088,4.8],[3.708,10.963],[0,7.885],[-0.602,1.69],[-0.167,1.754],[0.872,0.55],[4.625,0.64],[12.2,-2.701],[0,0],[1.493,-0.1],[3.808,-1.99],[-1.131,-1.67],[-0.957,-1.766],[3.346,-2.496],[0.446,-11.315],[-0.17,-2.343],[0.234,-3.981],[0,0],[-1.653,-2.496],[-2.991,-0.717],[-6.023,-1.792],[-0.479,0.008],[-1.419,0.774],[-0.201,3.462],[-2.931,2.029],[-0.948,0.684]],"v":[[50.735,21.698],[40.824,15.157],[38.99,14.933],[38.234,14.037],[35.162,7.087],[33.234,4.482],[30.785,5.506],[29.032,7.612],[18.866,9.89],[17.527,10.978],[15.981,11.618],[0,17.589],[8.178,49.429],[14.302,63.88],[18.217,98.1],[15.54,121.498],[14.034,126.618],[15.921,131.405],[18.832,132.384],[32.665,130.848],[69.728,125.088],[90.541,122.529],[94.851,121.46],[96.651,110.509],[92.964,105.703],[93.573,100.231],[96.076,89.063],[95.895,55.144],[95.775,48.104],[98.07,36.354],[104.395,12.546],[96.584,7.746],[87.516,5.941],[69.775,0.028],[68.396,0.348],[67.111,4.642],[61.316,13.019],[52.328,18.831]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.309803921569,0.298039215686,0.43137254902,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 78","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":115,"ty":4,"nm":"Ellipse 51","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-25.81,-60.816,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[42.162,40.32],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 51","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":116,"ty":4,"nm":"Path 77","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-24.742,-72.686,0],"ix":2},"a":{"a":0,"k":[24.942,15.14,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.047,1.229],[-0.184,0.434],[-1.071,-0.23],[-4.437,-0.243],[-0.89,-4.16],[-2.192,3.135],[0.167,2.112],[2.443,1.933],[0,0],[1.217,0.479],[1.794,0],[4.772,-2.336],[1.446,-1.638],[0,0],[0.196,-0.646],[-0.174,-0.915],[-0.576,-1.6],[-2.061,-1.523],[-0.917,0.026]],"o":[[-0.047,-0.466],[0.542,-0.915],[4.303,1.037],[4.437,0.243],[3.219,-2.179],[1.231,-1.76],[-0.241,-3.046],[0,0],[-0.97,-0.851],[-1.7,-0.557],[-5.354,0],[-2.008,0.979],[0,0],[-0.498,0.475],[-0.187,0.909],[0.308,1.664],[0.957,2.65],[0.763,0.563],[1.613,-0.032]],"v":[[12.711,25.198],[12.918,23.828],[15.95,23.419],[29.228,23.758],[39.547,30.279],[47.732,22.241],[49.867,16.353],[44.513,9.096],[37.151,3.336],[33.845,1.326],[28.492,1.038],[12.624,1.038],[7.678,5.339],[1.099,12.788],[0.042,14.497],[0.517,17.217],[0.651,22.26],[7.042,26.811],[9.927,29.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.247058823529,0.239215686275,0.337254901961,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 77","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":117,"ty":4,"nm":"Path 71","parent":103,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-17.258,-24.946,0],"ix":2},"a":{"a":0,"k":[24.219,27.249,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.09,-2.654],[1.231,-4.006],[-4.39,-4.736],[-10.677,-0.483],[-1.487,0.445],[-0.982,0.994],[-0.703,4.422],[0.274,4.461],[0.345,0.862],[0.749,0.586],[2.807,1.516],[0.77,1.107],[0.139,1.007],[0,0],[0.68,1.031],[2.55,0.096],[0,0],[2.844,-0.55],[-0.482,-2.125]],"o":[[-0.489,4.16],[-1.847,6.048],[7.147,7.601],[1.553,0.128],[1.325,-0.516],[3.293,-3.168],[0.703,-4.422],[0,-0.923],[-0.448,-0.82],[-2.374,-2.086],[-1.205,-0.64],[-0.528,-0.882],[0,0],[-0.153,-1.211],[-1.519,-1.958],[0,0],[-2.911,-0.109],[-2.677,0.506],[0.697,2.57]],"v":[[5.574,13.023],[0.535,24.543],[6.264,41.823],[34.118,54.456],[38.722,53.976],[42.222,51.685],[47.991,39.711],[48.151,26.329],[47.629,23.628],[45.816,21.497],[38.019,16.076],[34.753,13.689],[33.743,10.828],[32.879,6.63],[31.614,3.225],[24.634,0.902],[15.265,0.55],[5.681,0.191],[4.39,5.164]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 71","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":118,"ty":4,"nm":"Path 70","parent":103,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-17.258,-24.946,0],"ix":2},"a":{"a":0,"k":[24.219,27.249,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.09,-2.654],[1.231,-4.006],[-4.39,-4.736],[-10.677,-0.483],[-1.487,0.445],[-0.982,0.994],[-0.703,4.422],[0.274,4.461],[0.345,0.862],[0.749,0.586],[2.807,1.516],[0.77,1.107],[0.139,1.007],[0,0],[0.68,1.031],[2.55,0.096],[0,0],[2.844,-0.55],[-0.482,-2.125]],"o":[[-0.489,4.16],[-1.847,6.048],[7.147,7.601],[1.553,0.128],[1.325,-0.516],[3.293,-3.168],[0.703,-4.422],[0,-0.923],[-0.448,-0.82],[-2.374,-2.086],[-1.205,-0.64],[-0.528,-0.882],[0,0],[-0.153,-1.211],[-1.519,-1.958],[0,0],[-2.911,-0.109],[-2.677,0.506],[0.697,2.57]],"v":[[5.574,13.023],[0.535,24.543],[6.264,41.823],[34.118,54.456],[38.722,53.976],[42.222,51.685],[47.991,39.711],[48.151,26.329],[47.629,23.628],[45.816,21.497],[38.019,16.076],[34.753,13.689],[33.743,10.828],[32.879,6.63],[31.614,3.225],[24.634,0.902],[15.265,0.55],[5.681,0.191],[4.39,5.164]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.752941176471,0.776470588235,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 70","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":119,"ty":4,"nm":"lower_body","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[235.144,302.048,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[103.212,230.799],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":120,"ty":4,"nm":"Path 322","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.05,13.727,0],"ix":2},"a":{"a":0,"k":[24.584,79.501,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.403,-3.757],[0,0],[2.034,-10.79],[0.977,-3.667],[1.272,-10.438],[0.034,-0.275],[0.85,-2.15],[0.689,-1.574],[0.167,-3.411],[5.479,0.78],[1.774,1.92],[-0.335,2.803],[-1.044,8.695],[-0.988,3.636],[-0.442,1.19],[-0.462,1.683],[-0.242,2.763],[-1.138,8.749],[0,0],[0.375,13.357],[0.134,1.984],[-2.469,1.798],[-3.145,1.299],[-0.408,-1.395],[-0.023,-3.077],[0.403,-3.757]],"o":[[0,0],[-1.037,10.931],[-0.669,3.718],[-2.717,10.182],[-0.04,0.301],[-0.261,2.304],[-0.669,1.594],[-1.339,3.149],[-4.824,-2.604],[-2.677,-0.378],[-2.008,-2.086],[1.053,-8.704],[0.348,-3.742],[0.361,-1.21],[0.609,-1.638],[0.64,-2.704],[1.078,-8.755],[0,0],[1.707,-13.261],[-0.054,-1.978],[-0.188,-2.874],[2.751,-1.984],[1.693,-0.704],[0.866,2.963],[0.038,3.776],[0,0]],"v":[[48.615,20.609],[44.64,62.286],[40.511,94.983],[38.008,106.067],[30.077,136.64],[29.97,137.555],[28.632,144.339],[26.33,148.96],[24.61,159.001],[9.023,153.881],[1.661,151.321],[0.223,143.238],[3.368,117.139],[5.376,106.055],[6.614,102.464],[8.3,97.504],[9.625,89.293],[13.139,63.054],[13.199,62.593],[15.829,22.651],[15.555,16.712],[17.563,10.517],[27.079,5.845],[47.826,0.2],[49.164,9.301],[48.615,20.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 322","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":121,"ty":4,"nm":"Path 323","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-6.297,-19.719,0],"ix":2},"a":{"a":0,"k":[45.309,95.68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.195,-7.895],[-1.419,-8.384],[0,0],[-4.685,-8.48],[-4.571,-5.69],[-10.648,-14.4],[-5.28,0.877],[-2.717,2.125],[-2.53,3.149],[3.427,2.24],[1.325,0.486],[2.182,5.018],[2.911,4.666],[5.448,10.592],[0.228,6.573],[0,0],[-0.783,1.683],[-5.1,0.57],[-5.124,2.644],[-1.559,2.816],[-0.167,2.906],[0,0],[0.957,2.458],[6.9,-0.294],[12.127,-3.571],[3.099,-0.595],[2.57,-0.832],[0.649,-3.993]],"o":[[0.274,8.486],[0,0],[1.599,9.472],[3.507,6.349],[11.23,13.99],[3.099,4.186],[3.467,-0.57],[3.212,-2.509],[2.53,-3.149],[-1.171,-0.762],[-5.307,-1.92],[-2.182,-5.018],[-6.331,-10.131],[-3.052,-5.926],[0,0],[-0.067,-1.843],[2.081,-4.48],[5.783,-0.646],[2.938,-1.517],[1.432,-2.56],[0,0],[0.154,-2.624],[-2.429,-6.182],[-12.836,0.55],[-3.005,0.883],[-2.677,0.518],[-4.604,1.485],[-1.339,7.793]],"v":[[0.037,51.541],[3.149,76.827],[6.074,94.107],[14.031,121.716],[27.155,139.168],[57.471,183.411],[70.274,191.251],[78.974,185.792],[88.584,178.298],[88.183,167.686],[84.261,166.15],[73.332,154.247],[66.908,139.181],[42.179,113.108],[38.605,93.735],[38.01,76.897],[38.679,71.457],[52.151,65.985],[68.661,61.006],[76.023,54.741],[77.816,46.261],[79.583,15.739],[78.914,7.938],[61.42,0.028],[24.612,9.429],[15.49,11.701],[6.897,12.84],[1.757,27.957]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 323","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":122,"ty":4,"nm":"Path 324","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32.989,83.972,0],"ix":2},"a":{"a":0,"k":[18.617,26.559,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.269,-2.182],[-0.294,-1.51],[-0.056,-8.527],[-0.384,-0.709],[-0.499,-0.208],[-2.73,2.285],[-0.288,6.419],[-0.301,1.632],[-1.298,2.112],[-1.337,3.98],[1.231,1.043],[0.528,0.15],[0,0],[0.502,-0.858],[2.483,-0.486],[2.369,-1.21]],"o":[[1.131,1.094],[1.636,8.382],[-0.073,0.795],[0.321,0.42],[3.273,1.491],[5.053,-4.23],[0.074,-1.651],[0.442,-2.419],[2.221,-3.6],[0.495,-1.498],[-0.431,-0.328],[0,0],[-1.285,-0.454],[-1.238,2.093],[-2.483,0.486],[-4.015,2.042]],"v":[[2.556,19.731],[4.349,23.936],[6.893,49.35],[7.368,51.654],[8.619,52.614],[18.417,49.74],[28.034,33.407],[28.215,28.454],[31.434,21.817],[36.788,10.413],[36.386,5.99],[34.934,5.267],[20.143,0.019],[15.171,8.249],[10.219,12.013],[2.302,13.005]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.266666666667,0.254901960784,0.403921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 324","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":123,"ty":4,"nm":"Path 325","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-10.082,97.469,0],"ix":2},"a":{"a":0,"k":[12.609,17.931,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.991,5.011],[0.468,0.377],[0.807,0.067],[1.948,-2.003],[1.519,-2.112],[0.415,-0.704],[-0.076,-1.183],[-0.241,-3.251],[-1.787,-2.138],[-4.578,-0.218],[0,0],[-0.982,0.291],[-0.447,1.222],[1.887,4.608]],"o":[[-0.274,-0.523],[-0.684,-0.416],[-2.811,-0.461],[-1.82,1.875],[-0.482,0.64],[-0.516,1.078],[-0.08,3.258],[0.194,2.726],[2.864,3.43],[0,0],[1.021,0.114],[1.23,-0.541],[1.934,-4.595],[-2.175,-5.306]],"v":[[16.811,2.438],[15.687,1.075],[13.418,0.339],[5.327,1.581],[2.302,8.621],[0.75,10.541],[0.08,13.984],[0.161,23.763],[2.617,31.487],[15.225,35.628],[18.94,35.814],[21.978,35.545],[24.601,32.787],[21.59,18.636]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.266666666667,0.254901960784,0.403921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 325","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":124,"ty":4,"nm":"Path 76","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-10.082,97.469,0],"ix":2},"a":{"a":0,"k":[12.609,17.931,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.991,5.011],[0.468,0.377],[0.807,0.067],[1.948,-2.003],[1.519,-2.112],[0.415,-0.704],[-0.076,-1.183],[-0.241,-3.251],[-1.787,-2.138],[-4.578,-0.218],[0,0],[-0.982,0.291],[-0.447,1.222],[1.887,4.608]],"o":[[-0.274,-0.523],[-0.684,-0.416],[-2.811,-0.461],[-1.82,1.875],[-0.482,0.64],[-0.516,1.078],[-0.08,3.258],[0.194,2.726],[2.864,3.43],[0,0],[1.021,0.114],[1.23,-0.541],[1.934,-4.595],[-2.175,-5.306]],"v":[[16.811,2.438],[15.687,1.075],[13.418,0.339],[5.327,1.581],[2.302,8.621],[0.75,10.541],[0.08,13.984],[0.161,23.763],[2.617,31.487],[15.225,35.628],[18.94,35.814],[21.978,35.545],[24.601,32.787],[21.59,18.636]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,0],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 76","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":125,"ty":4,"nm":"Path 75","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32.989,83.972,0],"ix":2},"a":{"a":0,"k":[18.617,26.559,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.269,-2.182],[-0.294,-1.51],[-0.056,-8.527],[-0.384,-0.709],[-0.499,-0.208],[-2.73,2.285],[-0.288,6.419],[-0.301,1.632],[-1.298,2.112],[-1.337,3.98],[1.231,1.043],[0.528,0.15],[0,0],[0.502,-0.858],[2.483,-0.486],[2.369,-1.21]],"o":[[1.131,1.094],[1.636,8.382],[-0.073,0.795],[0.321,0.42],[3.273,1.491],[5.053,-4.23],[0.074,-1.651],[0.442,-2.419],[2.221,-3.6],[0.495,-1.498],[-0.431,-0.328],[0,0],[-1.285,-0.454],[-1.238,2.093],[-2.483,0.486],[-4.015,2.042]],"v":[[2.556,19.731],[4.349,23.936],[6.893,49.35],[7.368,51.654],[8.619,52.614],[18.417,49.74],[28.034,33.407],[28.215,28.454],[31.434,21.817],[36.788,10.413],[36.386,5.99],[34.934,5.267],[20.143,0.019],[15.171,8.249],[10.219,12.013],[2.302,13.005]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,0],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 75","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":126,"ty":4,"nm":"Path 74","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-6.298,-19.719,0],"ix":2},"a":{"a":0,"k":[45.309,95.68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.195,-7.895],[-1.419,-8.384],[0,0],[-4.685,-8.48],[-4.571,-5.69],[-10.648,-14.4],[-5.28,0.877],[-2.717,2.125],[-2.53,3.149],[3.427,2.24],[1.325,0.486],[2.182,5.018],[2.911,4.666],[5.448,10.592],[0.228,6.573],[0,0],[-0.783,1.683],[-5.1,0.57],[-5.124,2.644],[-1.559,2.816],[-0.167,2.906],[0,0],[0.957,2.458],[6.9,-0.294],[12.127,-3.571],[3.099,-0.595],[2.57,-0.832],[0.649,-3.993]],"o":[[0.274,8.486],[0,0],[1.599,9.472],[3.507,6.349],[11.23,13.99],[3.099,4.186],[3.467,-0.57],[3.212,-2.509],[2.53,-3.149],[-1.171,-0.762],[-5.307,-1.92],[-2.182,-5.018],[-6.331,-10.131],[-3.052,-5.926],[0,0],[-0.067,-1.843],[2.081,-4.48],[5.783,-0.646],[2.938,-1.517],[1.432,-2.56],[0,0],[0.154,-2.624],[-2.429,-6.182],[-12.836,0.55],[-3.005,0.883],[-2.677,0.518],[-4.604,1.485],[-1.339,7.793]],"v":[[0.037,51.541],[3.149,76.827],[6.074,94.107],[14.031,121.716],[27.155,139.168],[57.471,183.411],[70.274,191.251],[78.974,185.792],[88.584,178.298],[88.183,167.686],[84.261,166.15],[73.332,154.247],[66.908,139.181],[42.179,113.108],[38.605,93.735],[38.01,76.897],[38.679,71.457],[52.151,65.985],[68.661,61.006],[76.023,54.741],[77.816,46.261],[79.583,15.739],[78.914,7.938],[61.42,0.028],[24.612,9.429],[15.49,11.701],[6.897,12.84],[1.757,27.957]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 74","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":127,"ty":4,"nm":"Path 73","parent":119,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-1.105,34.3,0],"ix":2},"a":{"a":0,"k":[16.982,37.481,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.178,-0.311],[0.977,-3.667],[1.271,-10.438],[0.033,-0.275],[8.111,11.475],[-0.462,1.683],[-0.261,2.782],[-1.138,8.749],[0,0],[-0.865,-1.722],[-6.331,-10.131]],"o":[[-0.669,3.718],[-2.717,10.182],[-0.04,0.301],[-8.312,-11.353],[0.609,-1.638],[0.665,-2.72],[1.078,-8.755],[0,0],[0.47,1.857],[5.448,10.585],[0.21,0.316]],"v":[[33.964,32.39],[31.461,43.475],[23.53,74.047],[23.423,74.962],[0,39.923],[1.686,34.963],[3.078,26.7],[6.592,0.461],[6.652,0],[8.66,5.382],[33.382,31.449]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 73","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":128,"ty":4,"nm":"Path 72","parent":119,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.049,13.727,0],"ix":2},"a":{"a":0,"k":[24.584,79.501,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.403,-3.757],[0,0],[2.034,-10.79],[0.977,-3.667],[1.272,-10.438],[0.034,-0.275],[0.85,-2.15],[0.689,-1.574],[0.167,-3.411],[5.479,0.78],[1.774,1.92],[-0.335,2.803],[-1.044,8.695],[-0.988,3.636],[-0.442,1.19],[-0.462,1.683],[-0.242,2.763],[-1.138,8.749],[0,0],[0.375,13.357],[0.134,1.984],[-2.469,1.798],[-3.145,1.299],[-0.408,-1.395],[-0.023,-3.077],[0.403,-3.757]],"o":[[0,0],[-1.037,10.931],[-0.669,3.718],[-2.717,10.182],[-0.04,0.301],[-0.261,2.304],[-0.669,1.594],[-1.339,3.149],[-4.824,-2.604],[-2.677,-0.378],[-2.008,-2.086],[1.053,-8.704],[0.348,-3.742],[0.361,-1.21],[0.609,-1.638],[0.64,-2.704],[1.078,-8.755],[0,0],[1.707,-13.261],[-0.054,-1.978],[-0.188,-2.874],[2.751,-1.984],[1.693,-0.704],[0.866,2.963],[0.038,3.776],[0,0]],"v":[[48.615,20.609],[44.64,62.286],[40.511,94.983],[38.008,106.067],[30.077,136.64],[29.97,137.555],[28.632,144.339],[26.33,148.96],[24.61,159.001],[9.023,153.881],[1.661,151.321],[0.223,143.238],[3.368,117.139],[5.376,106.055],[6.614,102.464],[8.3,97.504],[9.625,89.293],[13.139,63.054],[13.199,62.593],[15.829,22.651],[15.555,16.712],[17.563,10.517],[27.079,5.845],[47.826,0.2],[49.164,9.301],[48.615,20.609]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.376470588235,0.364705882353,0.509803921569,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 72","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":129,"ty":4,"nm":"platform shadow","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[84.419,398.159,0],"to":[-12.167,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[11.419,398.159,0],"to":[0,0,0],"ti":[-12.167,0,0]},{"t":181,"s":[84.419,398.159,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[689.214,37.708],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":130,"ty":4,"nm":"Path 367","parent":129,"sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[344.607,18.854,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.958,-2.755],[0.133,-0.088],[0.944,-0.144],[0,0],[26.418,0.101],[0,0],[0,5.827],[-37.007,3.522],[-4.166,0.346],[-2.682,0.198],[0,0],[-3.557,0.243],[0,0],[0,0],[-3.278,0.198],[0,0],[0,0],[-4.122,0.214],[-3.532,0.177],[-44.931,0.859],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-16.197,0.004],[-29.585,-0.482],[0,0],[-15.949,-0.42],[0,0],[-34.064,-2.194],[0,0],[-7.766,-0.618],[-6.37,-0.624],[-2.086,-0.216],[0,0]],"o":[[-0.109,0.102],[-0.739,0.416],[0,0],[-23.077,8.534],[0,0],[-58.667,-4.004],[0,-4.517],[3.837,-0.371],[2.564,-0.214],[0,0],[3.377,-0.255],[0,0],[0,0],[3.148,-0.216],[0,0],[0,0],[3.948,-0.235],[3.421,-0.177],[35.815,-1.761],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[15.613,-0.124],[32.015,0],[0,0],[16.985,0.272],[0,0],[45.984,1.199],[0,0],[8.744,0.562],[7.31,0.581],[2.207,0.216],[0,0],[8.828,0.945]],"v":[[684.893,23.704],[684.53,23.988],[681.969,24.841],[681.969,24.841],[606.465,37.706],[94.463,37.706],[0,22.567],[58.499,10.319],[70.503,9.244],[78.371,8.626],[82.925,8.274],[93.327,7.526],[93.615,7.526],[97.34,7.279],[106.978,6.661],[109.362,6.519],[115.443,6.161],[127.549,5.487],[137.979,4.956],[260.015,1.007],[272.847,0.717],[277.168,0.655],[286.294,0.519],[289.953,0.47],[293.799,0.42],[296.537,0.389],[309.388,0.253],[315.99,0.192],[317.341,0.192],[365.056,0],[457.703,0.735],[457.703,0.735],[507.104,1.773],[507.253,1.773],[628.461,6.933],[629.085,6.977],[653.874,8.756],[674.417,10.573],[680.851,11.228],[681.382,11.29]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.43137254901960786,0.4745098039215686,0.7333333333333333,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 367","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":131,"ty":4,"nm":"Path 98","parent":1,"sr":1,"ks":{"o":{"a":0,"k":99.501,"ix":11},"r":{"a":0,"k":15,"ix":10},"p":{"a":0,"k":[0,-11.5,0],"ix":2},"a":{"a":0,"k":[679.1,515.222,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 98 Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 98 Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0},{"ddd":0,"ind":132,"ty":4,"nm":"Path 99","parent":1,"sr":1,"ks":{"o":{"a":0,"k":70.124,"ix":11},"r":{"a":0,"k":15,"ix":10},"p":{"a":0,"k":[0,11.5,0],"ix":2},"a":{"a":0,"k":[679.1,515.222,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"op","nm":"Offset Paths 1","a":{"a":0,"k":-0.5,"ix":1},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 99 Stroke","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-191.178,-0.525],[-0.606,-223.115],[347.595,0.954],[0.607,223.115],[-131.954,130.9]],"o":[[347.594,0.954],[0.607,223.115],[-347.595,-0.954],[-0.273,-100.401],[161.873,-160.581]],"v":[[898.199,0.002],[1358.199,678.509],[728.002,1030.439],[99.445,675.055],[47.746,282.32]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path 99 Fill","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":-3,"op":184,"st":0,"bm":0}],"markers":[]}\ No newline at end of filediff --git a/frontend/src/components/custom-pager.vue b/frontend/src/components/custom-pager.vuenew file mode 100644index 0000000..acc0e4b--- /dev/null+++ b/frontend/src/components/custom-pager.vue@@ -0,0 +1,112 @@+<template>+ <div class="pagerContainer">+ <v-row>+ <v-col cols="8" class="fl-c">+ <v-pagination+ v-model="data.pageIndex"+ :total-visible="7"+ :length="PAGER_LENGTH"+ size="small"+ rounded="circle"+ :active-color="primaryColor"+ @update:modelValue="method.pageChange"+ ></v-pagination>+ </v-col>+ <v-col cols="2" class="fl-s">+ <v-select+ v-model="data.pageSizeSelect"+ hide-details+ variant="underlined"+ density="compact"+ :items="PAGER_SIZE_OPTION"+ item-title="label"+ item-value="value"+ @update:modelValue="method.changePageSizeSelect"+ ></v-select>+ </v-col>+ <v-col cols="2" class="fl-c">+ <div>{{ TOTAL_RECORD }}</div>+ </v-col>+ </v-row>+ </div>+</template>+<script setup lang="ts">+import { reactive, computed } from 'vue'+import { PAGE_SIZE, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { primaryColor } from '@/constant/style'+import i18n from '@/languages/i18n'++const emit = defineEmits(['click', 'page-change'])++const props = defineProps({+ currentPage: {+ type: Number,+ default: 1+ },+ pageSize: {+ type: Number,+ default: DEFAULT_PAGE_SIZE+ },+ total: {+ type: Number,+ default: 0+ },+ pageSizes: {+ type: Array<number>,+ default: PAGE_SIZE+ },+ // !For the time being is not enabled+ layouts: {+ type: Array<string>,+ default: ['PrevJump', 'PrevPage', 'Number', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']+ },+ // !For the time being is not enabled+ perfect: {+ type: Boolean,+ default: false+ }+})++const data = reactive({+ pageIndex: 1,+ pageSizeSelect: DEFAULT_PAGE_SIZE+})++const method = reactive({+ pageChange: (currentPage: number) => {+ emit('page-change', { currentPage, pageSize: props.pageSize })+ },+ changePageSizeSelect: (pageSize: number) => {+ emit('page-change', { pageIndex: data.pageIndex, pageSize })+ }+})++const PAGER_SIZE_OPTION = computed(() => {+ const res = []+ for (const pageSize of props.pageSizes) {+ res.push({ label: `${ pageSize }${ i18n.global.t('system.pager.pageSizes') }`, value: pageSize })+ }+ return res+})+const TOTAL_RECORD = computed(() => `${ i18n.global.t('system.pager.total') } ${ props.total } ${ i18n.global.t('system.pager.record') }`)+const PAGER_LENGTH = computed(() => {+ if (!props.total) {+ return 1+ }+ return Math.ceil(props.total / props.pageSize)+})+</script>+<style lang="less" scoped>+.pagerContainer {+ color: #666;+}+.fl-s{+ display: flex;+ align-items: flex-start;+}+.fl-c {+ display: flex;+ align-items: center;+ justify-content: flex-end;+}+</style>diff --git a/frontend/src/components/login/login-form.vue b/frontend/src/components/login/login-form.vuenew file mode 100644index 0000000..d8bdb72--- /dev/null+++ b/frontend/src/components/login/login-form.vue@@ -0,0 +1,209 @@+<template>+ <div class="loginForm">+ <div class="titleText">+ <h5>{{ $t('login.welcomeTitle') }}</h5>+ </div>+ <div class="formContainer">+ <v-form ref="VFormRef" v-model="data.valid" lazy-validation @keydown.enter.prevent="method.login()">+ <v-text-field v-model="data.userName" required :rules="data.userNameVaildRules" :label="$t('login.userName')" variant="solo"></v-text-field>+ <v-text-field+ v-model="data.password"+ required+ :rules="data.passwordVaildRules"+ :autocomplete="false"+ :append-inner-icon="data.showPassword ? 'mdi-eye' : 'mdi-eye-off'"+ :type="data.showPassword ? 'text' : 'password'"+ :label="$t('login.password')"+ variant="solo"+ @click:append-inner="method.handleShowPassword()"+ ></v-text-field>+ <v-checkbox v-model="data.remember" :label="$t('login.rememberTips')"></v-checkbox>+ <v-btn color="purple" class="loginBtn" @click="method.login()">{{ $t('login.mainButtonLabel') }}</v-btn>+ <v-btn class="mt-2" color="#666" variant="plain" @click="method.openRegisterDialog">+ {{ i18n.global.t('login.registerTips') }}+ </v-btn>+ </v-form>+ </div>+ <userRegisterForm :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ </div>+</template>++<script lang="ts" setup>+import { reactive, ref, onMounted } from 'vue'+import { Md5 } from 'ts-md5'+import i18n from '@/languages/i18n'+import { login, getUserAuthority } from '@/api/sys/login'+import { store } from '@/store'+import { hookComponent } from '@/components/system'+import { router } from '@/router/index'+import userRegisterForm from './user-register-form.vue'++// Get v-form ref+const VFormRef = ref()++const data = reactive({+ showDialog: false,+ valid: true,+ showPassword: false,+ userName: '',+ password: '',+ remember: false,+ dialogForm: {+ id: 0,+ user_num: '',+ user_name: '',+ auth_string: '',+ email: '',+ sex: '',+ is_valid: true+ },+ userNameVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.userName') }!`],+ passwordVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.password') }!`]+})++const method = reactive({+ handleShowPassword: () => {+ data.showPassword = !data.showPassword+ },+ login: async () => {+ const { valid } = await VFormRef.value.validate()+ if (!valid) {+ return+ }+ const { data: loginRes } = await login({+ user_name: data.userName,+ password: Md5.hashStr(data.password)+ })++ if (loginRes.isSuccess) {+ const expiredTime = new Date().getTime() + loginRes.data.expire * 60 * 1000++ store.commit('user/setToken', loginRes.data.access_token)+ store.commit('user/setRefreshToken', loginRes.data.refresh_token)+ store.commit('user/setExpirationTime', expiredTime)+ store.commit('user/setEffectiveMinutes', loginRes.data.expire)+ store.commit('user/setUserInfo', loginRes.data)++ const { data: authorityRes } = await getUserAuthority(loginRes.data.userrole_id)+ if (!authorityRes.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: authorityRes.errorMessage+ })+ return+ }+ if (authorityRes.data.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('login.notAuthority')+ })+ return+ }+ store.commit('user/setUserMenuList', authorityRes.data)++ hookComponent.$message({+ type: 'success',+ content: i18n.global.t('login.loginSuccess')+ })++ // Remember user login info+ if (data.remember) {+ const rememberJSON = JSON.stringify({+ userName: window.btoa(encodeURIComponent(data.userName)),+ password: window.btoa(encodeURIComponent(data.password))+ })+ localStorage.setItem('userLoginInfo', rememberJSON)+ } else {+ localStorage.setItem('userLoginInfo', '')+ }+ // Jump home+ store.commit('system/setCurrentRouterPath', 'homepage')+ router.push('home')+ } else {+ hookComponent.$message({+ type: 'error',+ content: loginRes.errorMessage+ })+ }+ },+ openRegisterDialog: () => {+ data.dialogForm = {+ id: 0,+ user_num: '',+ user_name: '',+ auth_string: '',+ email: '',+ sex: '',+ is_valid: true+ }+ data.showDialog = true+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // after Add or update success.+ saveSuccess: () => {+ method.closeDialog()+ }+})++onMounted(() => {+ // Get remember username and password+ const rememberJSON = localStorage.getItem('userLoginInfo')+ if (rememberJSON) {+ const obj = JSON.parse(rememberJSON)+ try {+ data.userName = decodeURIComponent(window.atob(obj.userName))+ data.password = decodeURIComponent(window.atob(obj.password))+ } catch {+ data.userName = window.atob(obj.userName)+ data.password = window.atob(obj.password)+ }+ data.remember = true+ }+})+</script>++<style scoped lang="less">+.loginForm {+ // min-height: ;+ height: 50%;+ width: 100%;+ box-sizing: border-box;+ padding: 16px;+ .titleText {+ box-sizing: border-box;+ padding: 20px;+ h5 {+ font-size: 1.5rem !important;+ font-weight: 500;+ line-height: 2rem;+ letter-spacing: normal !important;+ font-family: inter, sans-serif, -apple-system, blinkmacsystemfont, Segoe UI, roboto, Helvetica Neue, arial, sans-serif, 'Apple Color Emoji',+ 'Segoe UI Emoji', Segoe UI Symbol !important;+ text-transform: none !important;+ }+ }+ .formContainer {+ box-sizing: border-box;+ padding: 12px 20px;+ .v-btn {+ width: 100%;+ }+ .v-text-field {+ margin-top: 10px;+ }+ .v-checkbox {+ color: #b2b0b5;+ margin-inline-start: -0.5625rem;+ margin-top: -10px;+ height: 60px;+ }+ }+}++.loginBtn {+ height: 45px;+}+</style>diff --git a/frontend/src/components/login/user-register-form.vue b/frontend/src/components/login/user-register-form.vuenew file mode 100644index 0000000..1f9d491--- /dev/null+++ b/frontend/src/components/login/user-register-form.vue@@ -0,0 +1,169 @@+<template>+ <v-dialog v-model="isShow" width="20%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('login.register')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.user_name"+ :label="$t('base.userManagement.user_register_name')"+ :rules="data.rules.user_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.auth_string"+ :label="$t('base.userManagement.auth_string')"+ :rules="data.rules.auth_string"+ variant="outlined"+ :append-icon="data.isShowPassword ? 'mdi-eye' : 'mdi-eye-off'"+ :type="data.isShowPassword ? 'text' : 'password'"+ @click:append="data.isShowPassword = !data.isShowPassword"+ ></v-text-field>+ <v-select+ v-model="data.form.sex"+ :items="data.combobox.sex"+ item-title="label"+ item-value="value"+ :rules="data.rules.sex"+ :label="$t('base.userManagement.sex')"+ variant="outlined"+ clearable+ ></v-select>+ <v-text-field+ v-model="data.form.email"+ :label="$t('base.userManagement.email')"+ :rules="data.rules.email"+ variant="outlined"+ ></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 { Md5 } from 'ts-md5'+import { UserVO } from '@/types/Base/UserManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { registerUser } from '@/api/base/userManagement'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: UserVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ isShowPassword: false,+ form: ref<UserVO>({+ id: 0,+ user_num: '',+ user_name: '',+ auth_string: '',+ email: '',+ sex: '',+ is_valid: true+ }),+ rules: {+ user_num: [],+ user_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_register_name') }!`+ ],+ auth_string: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.auth_string') }!`],+ email: [],+ sex: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.sex') }!`],+ contact_tel: [],+ is_valid: []+ },+ combobox: ref<{+ sex: {+ label: string+ value: string+ }[]+ }>({+ sex: []+ })+})++const method = reactive({+ // Get the options required by the drop-down box+ getCombobox: () => {+ // Static drop-down box+ const sexOptions = ['male', 'female']+ data.combobox.sex = []+ for (const sex of sexOptions) {+ data.combobox.sex.push({+ label: i18n.global.t(`system.combobox.sex.${ sex }`),+ value: sex+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()++ if (valid) {+ const form = {+ id: 0,+ user_num: '',+ user_name: data.form.user_name,+ auth_string: Md5.hashStr(data.form.auth_string as string),+ email: data.form.email,+ sex: data.form.sex,+ is_valid: true+ }++ const { data: res } = await registerUser(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) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/components/lottie.vue b/frontend/src/components/lottie.vuenew file mode 100644index 0000000..db06ac5--- /dev/null+++ b/frontend/src/components/lottie.vue@@ -0,0 +1,40 @@+<template>+ <div ref="lottieBox"></div>+</template>++<script lang="ts" setup>+import lottie from 'lottie-web'+import { onMounted, ref } from 'vue'++const props = defineProps({+ src: {+ type: Object,+ default: () => {}+ },+ path: {+ type: String,+ default: ''+ },+ loop: {+ type: Boolean,+ default: true+ },+ autoplay: {+ type: Boolean,+ default: true+ }+})+const lottieBox = ref(null)+onMounted(() => {+ if (lottieBox.value) {+ lottie.loadAnimation({+ container: lottieBox.value,+ renderer: 'svg',+ loop: props.loop,+ autoplay: props.autoplay,+ path: props.path,+ animationData: Object.keys(props.src).length == 0 ? '' : props.src+ })+ }+})+</script>diff --git a/frontend/src/components/page/nav-list.vue b/frontend/src/components/page/nav-list.vuenew file mode 100644index 0000000..21cd49a--- /dev/null+++ b/frontend/src/components/page/nav-list.vue@@ -0,0 +1,126 @@+<template>+ <div style="height: 100%">+ <!-- title -->+ <div class="nav-list-title">{{ title }}</div>++ <!-- list -->+ <div class="nav-list">+ <div+ v-for="(item, index) of listData"+ :key="index"+ class="nav-item"+ :class="[indexValue === String(item[indexKey]) ? 'is-active-item' : '']"+ @click.stop="method.itemClick(item)"+ >+ <div class="nav-item__name">+ {{ item[labelKey] }}+ </div>+ <v-icon v-if="indexValue === String(item[indexKey])" class="nav-item__icon" icon="mdi-menu-left"></v-icon>+ </div>+ </div>++ <!-- no data -->+ <div v-if="!listData.length" class="null-data">{{ $t('system.tips.noData') }}</div>+ </div>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'++const emit = defineEmits(['itemClick'])++const props = defineProps<{+ title: string // Sidebar Title+ listData: any[] // Sidebar Data+ labelKey: string // Key displayed in the sidebar+ // The selected key and value in the sidebar+ // For example, if a List is [{a: 1, b: 2}, {a: 3, b: 4}], I want to activate the row with b=4. Then indexKey=b indexValue=4+ indexKey: string+ indexValue: string+}>()++const method = reactive({+ itemClick: (item: any) => {+ if (props.indexValue === String(item[props.indexKey])) {+ return+ }+ emit('itemClick', item)+ }+})+</script>++<style lang="less" scoped>+@normal-transition: all 0.2s ease;+.nav-list-title {+ height: 35px;+ width: 100%;+ box-sizing: border-box;+ padding-left: 10px;+ background-color: #f8f8f9;+ color: #444;+ display: flex;+ justify-content: flex-start;+ align-items: center;+}++.nav-list {+ height: 100%;+ overflow-y: scroll;+}+.nav-list::-webkit-scrollbar {+ display: none;+}++.nav-item {+ box-sizing: border-box;+ width: 93%;+ min-height: 40px;+ padding: 10px 20px;+ margin: 8px auto;+ transition: @normal-transition;+ border-radius: 5px;+ display: flex;+ justify-content: flex-start;+ align-items: center;+}++.nav-item:hover {+ cursor: pointer;+ background-color: #e3ecfb;+ transition: @normal-transition;+}++.nav-item__name {+ width: 80%;+}++.is-active-item {+ background-color: #e3ecfb;+ color: #9C27B0;+ transition: @normal-transition;+ position: relative;+ // justify-content: space-between;++ // .nav-item__name {+ // width: 80%;+ // }+ .nav-item__icon {+ width: 20px;+ position: absolute;+ right: 5px;+ > img {+ width: 15px;+ height: 12px;+ }+ }+}++.null-data {+ font-size: 12px;+ color: #606266;+ position: absolute;+ top: 50%;+ left: 50%;+ transform: translate(-50%, -50%);+}+</style>diff --git a/frontend/src/components/select/commodity-select.vue b/frontend/src/components/select/commodity-select.vuenew file mode 100644index 0000000..bcc2b4e--- /dev/null+++ b/frontend/src/components/select/commodity-select.vue@@ -0,0 +1,237 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stock.stockSelectModal')}`"></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('wms.stock.warehouse')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.location_name"+ :label="$t('wms.stock.location_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ 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('wms.stock.warehouse')"></vxe-column>+ <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="spu_code" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <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="qty_available" :title="$t('wms.stock.qty_available')"></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 { getStockSelectList } from '@/api/wms/stockManagement'+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'++const emit = defineEmits(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+ sqlTitle?: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ location_name: '',+ warehouse_name: '',+ spu_name: '',+ sku_code: ''+ },+ 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 getStockSelectList({+ ...data.tablePage,+ sqlTitle: props.sqlTitle+ })+ 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()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++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/freight-select.vue b/frontend/src/components/select/freight-select.vuenew file mode 100644index 0000000..5e1d409--- /dev/null+++ b/frontend/src/components/select/freight-select.vue@@ -0,0 +1,229 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.freightSetting.freightSelectModal')}`"></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.carrier"+ :label="$t('base.freightSetting.carrier')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.departure_city"+ :label="$t('base.freightSetting.departure_city')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.arrival_city"+ :label="$t('base.freightSetting.arrival_city')"+ 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="carrier" :title="$t('base.freightSetting.carrier')"></vxe-column>+ <vxe-column field="departure_city" :title="$t('base.freightSetting.departure_city')"></vxe-column>+ <vxe-column field="arrival_city" :title="$t('base.freightSetting.arrival_city')"></vxe-column>+ <vxe-column field="price_per_weight" :title="$t('base.freightSetting.price_per_weight')"></vxe-column>+ <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="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 { getFreightList } from '@/api/base/freightSetting'+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(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ carrier: '',+ departure_city: '',+ arrival_city: ''+ },+ 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 getFreightList(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()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++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/location-select.vue b/frontend/src/components/select/location-select.vuenew file mode 100644index 0000000..85b7580--- /dev/null+++ b/frontend/src/components/select/location-select.vue@@ -0,0 +1,219 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.locationSelectModal')}`"></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.location_name"+ :label="$t('base.warehouseSetting.location_name')"+ 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="warehouse_area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>+ <vxe-column field="warehouse_area_property" :title="$t('base.warehouseSetting.area_property')">+ <template #default="{ row, column }">+ <span>{{ formatAreaProperty(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column>+ <vxe-column width="150px" field="location_length" :title="$t('base.warehouseSetting.location_length')"></vxe-column>+ <vxe-column width="150px" field="location_width" :title="$t('base.warehouseSetting.location_width')"></vxe-column>+ <vxe-column width="150px" field="location_heigth" :title="$t('base.warehouseSetting.location_heigth')"></vxe-column>+ <vxe-column width="150px" field="location_volume" :title="$t('base.warehouseSetting.location_volume')"></vxe-column>+ <vxe-column width="150px" field="location_load" :title="$t('base.warehouseSetting.location_load')"></vxe-column>+ <vxe-column field="roadway_number" :title="$t('base.warehouseSetting.roadway_number')"></vxe-column>+ <vxe-column field="shelf_number" :title="$t('base.warehouseSetting.shelf_number')"></vxe-column>+ <vxe-column field="layer_number" :title="$t('base.warehouseSetting.layer_number')"></vxe-column>+ <vxe-column field="tag_number" :title="$t('base.warehouseSetting.tag_number')"></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 { getGoodsLocationList } 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 { formatAreaProperty } from '@/utils/format/formatWarehouse'+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(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ location_name: ''+ },+ 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 getGoodsLocationList(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()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++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/sku-select.vue b/frontend/src/components/select/sku-select.vuenew file mode 100644index 0000000..47c4544--- /dev/null+++ b/frontend/src/components/select/sku-select.vue@@ -0,0 +1,216 @@+<!-- Select Modal -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('wms.stock.skuSelectModal')}`"></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.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ variant="outlined"+ density="compact"+ hide-details+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.searchForm.sku_code"+ :label="$t('base.commodityManagement.sku_code')"+ 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="spu_code" :title="$t('base.commodityManagement.spu_code')"></vxe-column>+ <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="supplier_name" :title="$t('base.commodityManagement.supplier_name')"></vxe-column>+ <vxe-column field="brand" :title="$t('base.commodityManagement.brand')"></vxe-column>+ <vxe-column field="origin" :title="$t('base.commodityManagement.origin')"></vxe-column>+ <vxe-column field="unit" :title="$t('base.commodityManagement.unit')"></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 { getSkuSelectList } from '@/api/wms/stockManagement'+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 { formatAreaProperty } from '@/utils/format/formatWarehouse'+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(['close', 'sureSelect'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: [],+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ searchForm: {+ location_name: '',+ spu_name: '',+ sku_code: ''+ },+ 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 getSkuSelectList(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()+ },++ closeDialog: () => {+ emit('close')+ }+})++const searchFormHeight = computed(() => computedSelectTableSearchHeight({}))++watch(+ () => isShow.value,+ (newVal) => {+ newVal && method.getList()+ }+)++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/hookComponent/dialog.ts b/frontend/src/components/system/hookComponent/dialog.tsnew file mode 100644index 0000000..cce6530--- /dev/null+++ b/frontend/src/components/system/hookComponent/dialog.ts@@ -0,0 +1,34 @@+import { createApp } from 'vue'+import DialogComponent from './dialog.vue'+import { DialogOptions } from '@/types/System/HookComponent'+// Use vuetify+import { vuetify } from '@/plugins/vuetify/index'+import i18n from '@/languages/i18n'++// Use the createApp of vue3 and the mount and unmount methods to create a mounted instance+export default {+ name: 'dialog',+ dialog: (options: DialogOptions) => {+ const mountNode = document.createElement('div')+ mountNode.style.zIndex = '9000'+ document.body.appendChild(mountNode)+ if (!options.confirmText) {+ options.confirmText = i18n.global.t('system.hookComponent.dialog.defaultConfirm')+ }+ if (!options.cancleText) {+ options.cancleText = i18n.global.t('system.hookComponent.dialog.defaultClose')+ }+ if (!options.title) {+ options.title = i18n.global.t('system.hookComponent.dialog.defaultTitle')+ }+ const app = createApp(DialogComponent, {+ ...options,+ visible: true,+ removeComponent: () => {+ app.unmount()+ document.body.removeChild(mountNode)+ }+ }).use(vuetify)+ return app.mount(mountNode)+ }+}diff --git a/frontend/src/components/system/hookComponent/dialog.vue b/frontend/src/components/system/hookComponent/dialog.vuenew file mode 100644index 0000000..5f4cbee--- /dev/null+++ b/frontend/src/components/system/hookComponent/dialog.vue@@ -0,0 +1,80 @@+<template>+ <v-dialog v-model="data.dialogVisible" persistent :width="dialogWidth">+ <v-card>+ <v-card-title class="text-h5"> {{ title }} </v-card-title>+ <v-card-text>{{ content }}</v-card-text>+ <v-card-actions>+ <v-spacer></v-spacer>+ <v-btn variant="text" @click="data.dialogVisible = false">+ {{ cancleText }}+ </v-btn>+ <v-btn v-if="typeof dialogProps.handleConfirm === 'function'" color="green-darken-1" variant="text" @click="method._sure()">+ {{ confirmText }}+ </v-btn>+ </v-card-actions>+ </v-card>+ </v-dialog>+</template>++<script lang="ts" setup>+import { watch, reactive } from 'vue'++const dialogProps = defineProps({+ visible: {+ type: Boolean,+ default: false+ },+ confirmText: {+ type: String,+ default: ''+ },+ cancleText: {+ type: String,+ default: ''+ },+ handleConfirm: {+ type: Function,+ default: null+ },+ // Remove dom function+ removeComponent: {+ type: Function,+ default: null+ },+ content: {+ type: String,+ default: ''+ },+ title: {+ type: String,+ default: ''+ },+ dialogWidth: {+ type: [String, Number],+ default: 700+ }+})++const data = reactive({+ dialogVisible: false,+ dialogText: ''+})++// Init dialog visible+data.dialogVisible = Boolean(dialogProps.visible) // Avoid shallow copies++const method = reactive({+ _sure: async () => {+ await dialogProps.handleConfirm()+ data.dialogVisible = false+ }+})++// Shut dialog run remove function+watch(+ () => data.dialogVisible,+ (val) => {+ !val && dialogProps.removeComponent()+ }+)+</script>diff --git a/frontend/src/components/system/hookComponent/message.ts b/frontend/src/components/system/hookComponent/message.tsnew file mode 100644index 0000000..8fbc452--- /dev/null+++ b/frontend/src/components/system/hookComponent/message.ts@@ -0,0 +1,61 @@+import { createApp } from 'vue'+import MessageComponent from './message.vue'+import { MessageOptions } from '@/types/System/HookComponent'+// Use vuetify+import { vuetify } from '@/plugins/vuetify/index'++// Use the createApp of vue3 and the mount and unmount methods to create a mounted instance+export default {+ name: 'message',+ message: (options: MessageOptions) => {+ const mountNode = document.createElement('div')+ mountNode.className = 'messageItems'+ mountNode.style.top = `${ getNewMsgTop() }px`+ mountNode.style.zIndex = '9999'+ document.body.appendChild(mountNode)+ const app = createApp(MessageComponent, {+ ...options,+ removeComponent: () => {+ setTimeout(+ () => {+ mountNode.style.opacity = '0'+ setTimeout(() => {+ app.unmount()+ document.body.removeChild(mountNode)+ resetMsgTop()+ }, 200)+ },+ options.shutDelay ? options.shutDelay - 200 : 1300+ )+ }+ }).use(vuetify)+ return app.mount(mountNode)+ }+}++function resetMsgTop() {+ const messageDomList: any = document.body.getElementsByClassName('messageItems')+ for (let i = 0; i < messageDomList.length; i++) {+ messageDomList[i].style.top = `${ getNewMsgTop(i) }px`+ }+}++// Get message top+function getNewMsgTop(index = -1) {+ const messageDomList = document.body.querySelectorAll('.messageItems')+ let top = 10+ if (index < 0) {+ for (let i = 0; i < messageDomList.length; i++) {+ top += messageDomList[i].clientHeight + 10+ }+ } else {+ for (let i = 0; i < messageDomList.length; i++) {+ if (i < index) {+ top += messageDomList[i].clientHeight + 10+ } else {+ break+ }+ }+ }+ return top+}diff --git a/frontend/src/components/system/hookComponent/message.vue b/frontend/src/components/system/hookComponent/message.vuenew file mode 100644index 0000000..320fb99--- /dev/null+++ b/frontend/src/components/system/hookComponent/message.vue@@ -0,0 +1,33 @@+<template>+ <v-alert+ :type="type || 'info'"+ :variant="variant || 'flat'"+ :border="border || false"+ :color="color || undefined"+ :width="messageWidth"+ :min-width="250"+ >+ <!-- :max-height="60" -->+ {{ content }}+ </v-alert>+</template>++<script lang="ts" setup>+import { onBeforeMount } from 'vue'++// Vue3 does not support external interfaces+const messageProps = defineProps<{+ type?: 'success' | 'info' | 'warning' | 'error'+ variant?: 'flat' | 'elevated' | 'tonal' | 'outlined' | 'text' | 'plain'+ content: string+ border?: boolean | 'top' | 'end' | 'bottom' | 'start'+ color?: string+ messageWidth?: string | number // message width pixel or percentage+ removeComponent(): void+}>()++onBeforeMount(() => {+ messageProps.removeComponent()+})+</script>+<style lang="less" scoped></style>diff --git a/frontend/src/components/system/index.ts b/frontend/src/components/system/index.tsnew file mode 100644index 0000000..5e8d5a4--- /dev/null+++ b/frontend/src/components/system/index.ts@@ -0,0 +1,22 @@+import '@/assets/css/hookComponent.css' // import hookComponent style+import { Components } from '@/types/System/HookComponent'++// Use import.meta.globEager to read the files in the components folder, distinguished by the suffix ts+const componentsList: any = import.meta.globEager('./hookComponent/**')++const List: any = {}+export default function (app: any) {+ Object.keys(componentsList).forEach((key) => {+ // Filter out ts suffix+ if (key.includes('.ts')) {+ const hookObj = componentsList[key].default+ // Assignment function component, thrown later, imported for use+ List[`$${ hookObj.name }`] = hookObj[hookObj.name]+ // Define function components into global variables, and use them in script in vue through proxy+ app.config.globalProperties[`$${ hookObj.name }`] = hookObj[hookObj.name]+ }+ })+}++// Export function components for import+export const hookComponent: Components = Listdiff --git a/frontend/src/components/system/languages.vue b/frontend/src/components/system/languages.vuenew file mode 100644index 0000000..bb6ed94--- /dev/null+++ b/frontend/src/components/system/languages.vue@@ -0,0 +1,71 @@+<template>+ <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>+ </template>+ <v-list>+ <v-list-item v-for="(item, index) in data.languageList" :key="index" :value="index" @click="method.changeLanguage(item.value)">+ <v-list-item-title>{{ item.title }}</v-list-item-title>+ </v-list-item>+ </v-list>+ </v-menu>+ </div>+</template>++<script lang="ts" setup>+import { reactive } from 'vue'+import { useI18n } from 'vue-i18n'+import { useLocale } from 'vuetify'+import { getSelcectedLang } from '@/languages/method/index'+import { getSelcectedLangForVuetify } from '@/plugins/vuetify/method/index'+import { store } from '@/store'+import { router } from '@/router'++const { locale } = useI18n()+const { current } = useLocale()++const data = reactive({+ showLanguage: false,+ languageList: [+ { title: '简体中文', value: 'zh' },+ { title: 'English', value: 'en' }+ ]+})++const method = reactive({+ changeLanguage: (lang: string) => {+ if (store.getters['system/language'] === lang) {+ return+ }+ localStorage.setItem('language', lang)+ store.commit('system/setLanguage', lang) // set store+ locale.value = getSelcectedLang(lang) // global+ current.value = getSelcectedLangForVuetify(lang) // vuetify++ if (!['/', '/login'].includes(router.currentRoute.value.path)) {+ store.commit('system/setRefreshFlag', true) // change language refresh page+ }+ }+})+</script>++<style lang="less" scoped>+.languageIcon {+ height: 40px;+ width: 40px;+ font-size: 16px;+ display: flex;+ justify-content: center;+ align-items: center;+ transition: all 0.5s;+ border-radius: 40px;+ &:hover {+ background-color: #e4e5ea;+ }+ &:active {+ background-color: #cdced3;+ }+}+</style>diff --git a/frontend/src/components/system/logo.vue b/frontend/src/components/system/logo.vuenew file mode 100644index 0000000..816d484--- /dev/null+++ b/frontend/src/components/system/logo.vue@@ -0,0 +1,28 @@+<template>+ <img+ class="SysTitleLogo"+ :style="{ height: height + 'px', top: top + 'px', left: left + 'px' }"+ src="@/assets/img/WMSTitle.png"+ />+</template>+<script setup lang="ts">+defineProps({+ height: {+ type: Number,+ default: 80+ },+ top: {+ type: Number,+ default: 20+ },+ left: {+ type: Number,+ default: 20+ }+})+</script>+<style lang="less">+.SysTitleLogo {+ position: absolute;+}+</style>diff --git a/frontend/src/components/tooltip-btn.vue b/frontend/src/components/tooltip-btn.vuenew file mode 100644index 0000000..4efd3ef--- /dev/null+++ b/frontend/src/components/tooltip-btn.vue@@ -0,0 +1,51 @@+<template>+ <v-tooltip location="bottom">+ <template #activator="{ props }">+ <v-btn :disabled="disabled" :flat="flat" class="mr-3" :size="size" icon v-bind="props" @click="method.clickEvent">+ <v-icon :color="iconColor"> {{ icon }} </v-icon>+ </v-btn>+ </template>+ <span>{{ tooltipText }}</span>+ </v-tooltip>+</template>+<script setup lang="ts">+import { reactive } from 'vue'++const emit = defineEmits(['click'])++defineProps({+ icon: {+ type: String,+ default: ''+ },+ tooltipText: {+ type: String,+ default: ''+ },+ size: {+ type: String,+ default: 'small'+ },+ // Whether show button shadow.+ // It's hasn't shadow when 'flat = true'.+ flat: {+ type: Boolean,+ default: false+ },+ iconColor: {+ type: String,+ default: ''+ },+ disabled: {+ type: Boolean,+ default: false+ }+})++const method = reactive({+ clickEvent: () => {+ emit('click')+ }+})+</script>+<style lang="less"></style>diff --git a/frontend/src/constant/commodityManagement.ts b/frontend/src/constant/commodityManagement.tsnew file mode 100644index 0000000..9ef539b--- /dev/null+++ b/frontend/src/constant/commodityManagement.ts@@ -0,0 +1,11 @@+// Acquisition unit+export function GetUnit(type: 'weight' | 'length' | 'volume', val: number) {+ switch (type) {+ case 'length':+ return ['mm', 'cm', 'dm', 'm'][val]+ case 'volume':+ return ['cm³', 'dm³', 'm³'][val]+ case 'weight':+ return ['mg', 'g', 'kg'][val]+ }+}\ No newline at end of filediff --git a/frontend/src/constant/style.ts b/frontend/src/constant/style.tsnew file mode 100644index 0000000..d6d954b--- /dev/null+++ b/frontend/src/constant/style.ts@@ -0,0 +1,73 @@+import { store } from '@/store'++interface pageHasElement {+ hasPager?: boolean+ hasTab?: boolean+ hasOperateBtn?: boolean+ hasToolBar?: boolean+}++export const primaryColor = '#9C27B0'+export const primaryLightColor = '#ECE7F6'+export const lightGrey = '#999999'+export const errorColor = '#BA2828'++export const SYSTEM_HEIGHT = {+ HEADER: 60,+ TAB: 70,+ OPERATE_BAR: 52,+ VXE_PAGER: 48,+ SELECT_TABLE: 500,+ TOOLBAR: 40+}++// The height of the content card+export const computedCardHeight = ({ hasTab = true, hasOperateBtn = true }: pageHasElement) => {+ const clientHeight = store.getters['system/clientHeight']+ const EXTRA_MARGIN = 100++ let res = clientHeight - SYSTEM_HEIGHT.HEADER - EXTRA_MARGIN++ if (hasTab) {+ res -= SYSTEM_HEIGHT.TAB+ }+ if (hasOperateBtn) {+ res -= SYSTEM_HEIGHT.OPERATE_BAR+ }++ return `${ res }px`+}++// The height of the table+export const computedTableHeight = ({ hasPager = true, hasTab = true, hasOperateBtn = true }: pageHasElement) => {+ const clientHeight = store.getters['system/clientHeight']+ const EXTRA_MARGIN = 100++ let res = clientHeight - SYSTEM_HEIGHT.HEADER - EXTRA_MARGIN++ if (hasPager) {+ res -= SYSTEM_HEIGHT.VXE_PAGER+ }+ if (hasTab) {+ res -= SYSTEM_HEIGHT.TAB+ }+ if (hasOperateBtn) {+ res -= SYSTEM_HEIGHT.OPERATE_BAR+ }++ return `${ res }px`+}++// The height of the table container in select modal.+export const computedSelectTableSearchHeight = ({ hasPager = true, hasToolBar = false }: pageHasElement) => {+ let res = SYSTEM_HEIGHT.SELECT_TABLE++ if (hasPager) {+ res += SYSTEM_HEIGHT.VXE_PAGER+ }+ if (hasToolBar) {+ res += SYSTEM_HEIGHT.TOOLBAR+ }++ return `${ res }px`+}diff --git a/frontend/src/constant/system.ts b/frontend/src/constant/system.tsnew file mode 100644index 0000000..1c0f15c--- /dev/null+++ b/frontend/src/constant/system.ts@@ -0,0 +1,2 @@+// unit: ms+export const DEBOUNCE_TIME = 350diff --git a/frontend/src/constant/vxeTable.ts b/frontend/src/constant/vxeTable.tsnew file mode 100644index 0000000..467eeaf--- /dev/null+++ b/frontend/src/constant/vxeTable.ts@@ -0,0 +1,14 @@+import { VxePagerPropTypes } from 'vxe-table'++export const PAGE_SIZE = [20, 50, 100]+export const DEFAULT_PAGE_SIZE = 20+export const PAGE_LAYOUT: VxePagerPropTypes.Layouts = [+ 'PrevJump',+ 'PrevPage',+ 'Number',+ 'NextPage',+ 'NextJump',+ 'Sizes',+ 'FullJump',+ 'Total'+]diff --git a/frontend/src/constant/warehouseWorking.ts b/frontend/src/constant/warehouseWorking.tsnew file mode 100644index 0000000..35c7119--- /dev/null+++ b/frontend/src/constant/warehouseWorking.ts@@ -0,0 +1,8 @@+export const PROCESS_JOB_COMBINE = true+export const PROCESS_JOB_SPLIT = false++export const FREEZE_JOB_FREEZE = true+export const FREEZE_JOB_UNFREEZE = false++export const TAKING_JOB_FINISH = true+export const TAKING_JOB_UNFINISH = false\ No newline at end of filediff --git a/frontend/src/languages/langs/cnZh.ts b/frontend/src/languages/langs/cnZh.tsindex b666ecd..1e7ee5f 100644--- a/frontend/src/languages/langs/cnZh.ts+++ b/frontend/src/languages/langs/cnZh.ts@@ -6,15 +6,531 @@ export default {defaultConfirm: '确认',defaultTitle: '提示'}+ },+ page: {+ add: '新增',+ update: '修改',+ refresh: '刷新',+ export: '导出',+ operate: '操作',+ edit: '编辑',+ delete: '删除',+ close: '关闭',+ submit: '提交',+ reset: '重置',+ confirm: '确认',+ insertOneRow: '新增一行',+ view: '查看',+ import: '导入',+ chooseFile: '选择文件',+ exportTemplate: '导出模板',+ noData: '暂无数据',+ },+ tips: {+ success: '成功!',+ fail: '失败!',+ beforeDeleteMessage: '您确定要删除此条数据吗?',+ beforeDeleteDetailMessage: '您确定要删除此行吗?',+ detailLengthIsZero: '请添加明细数据!',+ detailHasItemRepeat: '明细中含有重复项目!',+ noData: '暂无数据',+ beforeAsnConfirm: '确认到货?',+ beforeAsnUnload: '确认卸货?',+ beforeAsnSorted: '确认分拣完成?',+ requestTimeout: '请求超时!',+ requestFail: '接口请求失败,请重试'+ },+ checkText: {+ checkFormFail: '操作失败, 请检查数据后重试!',+ mustInput: '请填写',+ mustSelect: '请选择',+ integer: '整数',+ decimal: ' 小数',+ pleaseEnter: '请输入长度为',+ inputIntMsg: '的整数位',+ inputDecimalMsg: '的小数位',+ lengthValid: '字段长度应该在'+ },+ homeHeader: {+ logout: '注销'+ },+ combobox: {+ sex: {+ male: '男',+ female: '女'+ },+ yesOrNo: {+ yes: '是',+ no: '否'+ }+ },+ pager: {+ pageSizes: '条/页',+ goTo: '前往',+ total: '共',+ record: '条记录'+ }+ },+ router: {+ sideBar: {+ homepage: '首页',+ baseModule: '基础设置',+ ownerOfCargo: '货主信息',+ menuBasicSettings: '菜单基础设置',+ userManagement: '用户管理',+ commodityCategorySetting: '商品类别设置',+ commodityManagement: '商品管理',+ userRoleSetting: '角色设置',+ companySetting: '公司信息',+ freightSetting: '运费设置',+ warehouseSetting: '仓库设置',+ customer: '客户信息',+ supplier: '供应商信息',+ roleMenu: '菜单设置',+ stockManagement: '库存管理',+ warehouseWorkingModule: '仓内作业',+ warehouseProcessing: '仓内加工',+ warehouseMove: '库存移动',+ warehouseFreeze: '库存冻结',+ warehouseAdjust: '库存调整',+ warehouseTaking: '库存盘点',+ deliveryManagement: '发货管理',+ stockAsn: '收货管理'}},login: {welcomeTitle: '欢迎来到ModernWMS!👋🏻',- userNameMustInput: '请填写用户名!',- passwordMustInput: '请填写密码!',mainButtonLabel: '登录',rememberTips: '记住账号密码',userName: '用户名',- password: '密码'+ password: '密码',+ loginSuccess: '登录成功',+ notAuthority: '该账号未分配菜单权限,请联系管理员',+ registerTips: '没有账号?点此注册一个!',+ register: '注册'+ },+ homepage: {+ subTitle: '现代化仓库管理系统'+ },+ base: {+ freightSetting: {+ carrier: '承运商',+ departure_city: '始发城市',+ arrival_city: '到货城市',+ price_per_weight: '单公斤运费',+ price_per_volume: '单立方米运费',+ min_payment: '最小运费',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效',+ freightSelectModal: '运费选择框',+ },+ userManagement: {+ user_num: '员工编号',+ user_name: '员工名称',+ user_role: '角色',+ contact_tel: '联系方式',+ sex: '性别',+ is_valid: '是否有效',+ restPwd: '重置密码',+ checkboxIsNull: '请选中数据!',+ beforeResetPwd: '您确定要重置这些用户的密码吗?',+ afterResetPwd: '重置密码成功, 新密码为: ',+ user_register_name: '用户名',+ email: 'Email',+ auth_string: '密码'+ },+ warehouseSetting: {+ warehouseSetting: '仓库设置',+ reservoirSetting: '库区设置',+ locationSetting: '库位设置',+ locationSelectModal: '库位选择框',+ email: 'Email',+ warehouse_name: '仓库名称',+ city: '所在城市',+ address: '详细地址',+ contact_tel: '联系方式',+ manager: '负责人',+ is_valid: '是否有效',+ area_name: '库区名称',+ area_property: '库区类型',+ location_name: '库位编码',+ location_length: '库位长(m)',+ location_width: '库位宽(m)',+ location_heigth: '库位高(m)',+ location_volume: '库位容积(m³)',+ location_load: '库位承重(kg)',+ roadway_number: '巷道号',+ shelf_number: '货架号',+ layer_number: '层号',+ tag_number: '位号',+ picking_area: '拣货区',+ stocking_area: '备货区',+ receiving_area: '收货区',+ return_area: '退货区',+ defective_area: '次品区',+ inventory_area: '存货区',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间'+ },+ customer: {+ customer_name: '客户名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ email: 'Email',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效'+ },+ supplier: {+ supplier_name: '供应商名称',+ city: '所在城市',+ address: '详细地址',+ email: 'Email',+ manager: '负责人',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效'+ },+ userRoleSetting: {+ role_name: '用户角色',+ is_valid: '是否有效'+ },+ companySetting: {+ company_name: '公司名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ contact_tel: '联系方式'+ },+ ownerOfCargo: {+ goods_owner_name: '货主名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间'+ },+ commodityCategorySetting: {+ category_name: '商品类别',+ parent_name: '所属类别',+ creator: '创建人',+ create_time: '创建时间'+ },+ roleMenu: {+ role_name: '角色名称',+ menu_name: '菜单名称',+ beforeUpdateOrDel: '请先选择需要处理的数据!'+ },+ commodityManagement: {+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_name: '规格名称',+ category_name: '商品类别',+ spu_description: '商品描述',+ bar_code: '商品条码',+ supplier_name: '供应商名称',+ brand: '品牌',+ unit: '商品单位',+ cost: '商品成本',+ price: '商品价格',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ weight: '商品重量',+ lenght: '商品长度',+ width: '商品宽度',+ height: '商品高度',+ volume: '商品体积'+ }+ },+ wms: {+ stock: {+ stockSelectModal: '库存选择框',+ skuSelectModal: '商品选择框',+ warehouse: '仓库名称',+ location_name: '库位编码',+ qty_available: '可用数量'+ },+ warehouseWorking: {+ warehouseProcessing: {+ job_code: '作业单号',+ job_type: '作业类型',+ process_status: '加工状态',+ processor: '操作人',+ process_time: '操作时间',+ qty: '数量',+ is_source: '是否来源商品',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_name: '规格名称',+ target_warehouse: '目标仓库',+ target_location: '目标库位',+ unit: '商品单位',+ is_update_stock: '是否已更新库存',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ adjust_status: '是否已调整',+ source: '来源',+ target: '目标',+ process_split: '拆分加工',+ process_combine: '组合加工',+ confirmProcess: '确认加工',+ confirmAdjust: '确认调整',+ qtyMoreThanAvailable: '不可超过可用数量',+ beforeConfirmProcess: '您确认对该条数据进行加工吗?',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?',+ alreadyProcess: '该数据已完成加工,不可删除',+ alreadyAdjust: '该数据已完成调整,不可删除'+ },+ warehouseMove: {+ job_code: '作业单号',+ move_status: '作业状态',+ qty: '数量',+ handler: '操作人',+ handle_time: '操作时间',+ orig_goods_warehouse: '来源仓库',+ orig_goods_location_name: '来源库位',+ dest_googs_warehouse: '目标仓库',+ dest_googs_location_name: '目标库位',+ confirmMove: '确认移库',+ creator: '创建人',+ create_time: '创建时间',+ beforeConfirmMove: '您确认对该条数据进行移库吗?',+ unadjust: '未调整',+ adjusted: '已调整'+ },+ warehouseFreeze: {+ job_code: '作业单号',+ job_type: '作业类型',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ warehouse: '所在仓库',+ location_name: '所在库位',+ freeze: '冻结',+ unfreeze: '解冻'+ },+ warehouseAdjust: {+ job_code: '作业单号',+ job_type: '作业类型',+ warehouse: '所在仓库',+ location_name: '所在库位',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ qty: '调整差异数量',+ warehouseTake: '盘点',+ processCombine: '仓内加工',+ processSplit: '仓内加工',+ warehouseMove: '移库',+ confirmAdjust: '确认调整',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?'+ },+ warehouseTaking: {+ job_code: '作业单号',+ job_status: '作业状态',+ warehouse: '所在仓库',+ location_name: '所在库位',+ book_qty: '账面数量',+ counted_qty: '盘点数量',+ difference_qty: '差异数量',+ confirmTaking: '确认盘点',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ unfinish: '待作业',+ finish: '已完成',+ confirmAdjust: '确认调整',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?',+ addFromCommodity: '选择商品',+ addFromStock: '选择库存',+ addTips: '当目标库存不存在时,可通过手动选择商品和库位来新增记录'+ }+ },+ stockManagement: {+ stockLocation: '库位列表',+ stock: '库存列表'+ },+ stockLocation: {+ warehouse_name: '仓库名称',+ location_name: '库位名称',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_id: '规格标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ qty: '数量',+ qty_available: '可用数量',+ qty_locked: '锁定数量',+ qty_frozen: '冻结数量'+ },+ stockList: {+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_id: '规格标识',+ qty: '数量',+ qty_available: '可用数量',+ qty_locked: '锁定数量',+ qty_frozen: '冻结数量',+ qty_asn: '到货通知书数量',+ qty_to_unload: '待卸货数量',+ qty_to_sort: '待分拣数量',+ qty_sorted: '已分拣数量',+ shortage_qty: '欠货数量'+ },+ stockAsn: {+ tabNotice: '到货通知',+ tabToDoArrival: '待到货',+ tabToDoUnload: '待卸货',+ tabToDoSorting: '待分拣',+ tabToDoGrounding: '待上架',+ tabReceiptDetails: '收货明细'+ },+ stockAsnInfo: {+ id: '标识',+ asn_no: '到货通知书编号',+ asn_status: '到货通知书状态',+ spu_id: '商品spu标识',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_id: '商品sku标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ asn_qty: '到货通知书数据',+ actual_qty: '上架数量',+ sorted_qty: '分拣数量',+ shortage_qty: '短少数量',+ more_qty: '超量数量',+ damage_qty: '破损数量',+ weight: '总重量',+ volume: '总体积',+ supplier_id: '供应商标识',+ supplier_name: '供应商名称',+ goods_owner_id: '货主标识',+ goods_owner_name: '货主名称',+ is_valid: '是否有效'+ },+ skuInfo: {+ spu_id: '商品spu标识',+ spu_code: '商品编码',+ spu_name: '商品名称',+ category_id: '商品类别标识',+ category_name: '商品类别',+ spu_description: '商品描述',+ bar_code: '商品条码',+ supplier_id: '供应商标识',+ supplier_name: '供应商名称',+ brand: '品牌',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ sku_id: '规格标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ weight: '总重量',+ lenght: '商品长度',+ width: '商品宽度',+ height: '商品高度',+ volume: '商品体积',+ unit: '商品单位',+ cost: '商品成本',+ price: '商品价格'+ },+ deliveryManagement: {+ shipment: '发货单',+ preShipment: '预发货',+ newShipment: '新发货',+ goodsToBePicked: '待拣货',+ picked: '已拣货',+ toBePackaged: '待打包',+ package: '打包',+ packaged: '已打包',+ toBeWeighed: '待称重',+ weigh: '称重',+ weighed: '已称重',+ delivery: '出库',+ toBeDelivered: '待出库',+ outOfWarehouse: '已出库',+ signIn: '签收',+ signedIn: '已签收',+ dispatch_no: '发货单号',+ dispatch_status: '发货单状态',+ qty: '总数量',+ detailQty: '数量',+ weight: '总重量',+ volume: '总体积',+ customer_name: '客户名称',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ creator: '创建人',+ create_time: '创建时间',+ confirmOrder: '确认发货单',+ orderDetail: '发货单商品详情',+ quantityOverflow: '发货数量之和不能超出发货单数量',+ quantityIsZero: '请保证选择的商品至少有一项出库数量大于0!',+ NoItemSelected: '请至少选中一项商品进行出库!',+ confirmSuccess: '确认发货单成功!',+ confirmPicking: '确认拣货',+ confirmDelivery: '确认出库',+ confirmSignIn: '确认签收',+ detailWeight: '重量',+ unpackage_qty: '待打包数量',+ unweighing_qty: '待称重数量',+ validQtyMsgPackage: '请输入有效数值, 且不能超过总数量',+ validQtyMsgSignIn: '请输入有效数值, 且不能超过总数量',+ signInQty: '实际签收数量',+ incorrectStatusMsg: '操作失败, 状态应该为',+ backToThePreviousStep: '撤回到上一个流程',+ confirmBack: '确认撤回',+ or: '或',+ irreversible: '此操作不可逆',+ detailQuantityIsZero: '发货数量不能为0',+ qty_available: '可用数量',+ spu_description: '商品描述',+ bar_code: '条码',+ order_qty: '订单数量',+ unpicked_qty: '待拣货数量',+ picked_qty: '已拣货数量',+ detailVolume: '体积',+ package_qty: '已打包数量',+ package_person: '打包员',+ package_time: '打包时间',+ weighing_no: '称重单号',+ package_no: '打包流水号',+ weighing_person: '称重员',+ weighing_weight: '称重重量',+ waybill_no: '运单号',+ carrier: '承运单位',+ damagedQuantity: '到货破损数量',+ setFreight: '设置承运单位',+ departure_city: '始发城市',+ arrival_city: '到货城市',+ ViewInventoryDetails: '查看商品明细',+ invalidValue: '请输入有效数值',+ exceedingQuantity: '不能超过总数量'+ }}}diff --git a/frontend/src/languages/langs/enUs.ts b/frontend/src/languages/langs/enUs.tsindex 11f2416..b656b04 100644--- a/frontend/src/languages/langs/enUs.ts+++ b/frontend/src/languages/langs/enUs.ts@@ -6,15 +6,531 @@ export default {defaultConfirm: 'Agree',defaultTitle: 'Tips'}+ },+ page: {+ add: 'Add',+ update: 'Update',+ refresh: 'Refresh',+ export: 'Export',+ operate: 'Operate',+ edit: 'Edit',+ delete: 'Delete',+ close: 'Colse',+ submit: 'Submit',+ reset: 'Reset',+ confirm: 'Confirm',+ insertOneRow: 'Insert One Row',+ view: 'View',+ import: 'Import',+ chooseFile: 'Choose File',+ exportTemplate: 'Export Template',+ noData: 'No data',+ },+ tips: {+ success: ' success!',+ fail: ' fail!',+ beforeDeleteMessage: 'Do you want to delete this data?',+ beforeDeleteDetailMessage: 'Are you sure you want to delete this row?',+ detailLengthIsZero: 'Details verification before document submission!',+ detailHasItemRepeat: 'The details contain duplicate items!',+ noData: 'no data',+ beforeAsnConfirm: 'Confirm Arrival?',+ beforeAsnUnload: 'Confirm Unload?',+ beforeAsnSorted: 'Confirm Sorted?',+ requestTimeout: 'Request Timeout!',+ requestFail: 'Request fail.Please try it again'+ },+ checkText: {+ checkFormFail: 'Operation failed. Please check the data and try again!',+ mustInput: 'Please fill in the ',+ mustSelect: 'Please select ',+ integer: ' integer',+ decimal: ' decimal',+ pleaseEnter: 'Please enter ',+ inputIntMsg: 'decimal places of integer part',+ inputDecimalMsg: ' decimal places of the decimal part',+ lengthValid: 'The length should be between '+ },+ homeHeader: {+ logout: 'Logout'+ },+ combobox: {+ sex: {+ male: 'Male',+ female: 'Female'+ },+ yesOrNo: {+ yes: 'yes',+ no: 'no'+ }+ },+ pager: {+ pageSizes: '/page',+ goTo: 'Go to',+ total: 'Total',+ record: 'record'+ }+ },+ router: {+ sideBar: {+ homepage: 'Home Page',+ baseModule: 'Basic Settings',+ ownerOfCargo: 'Owner Information',+ menuBasicSettings: 'Menu',+ userManagement: 'User Management',+ commodityCategorySetting: 'Commodity Category',+ commodityManagement: 'Commodity Management',+ userRoleSetting: 'User Role',+ companySetting: 'Company Information',+ freightSetting: 'Freight Setting',+ warehouseSetting: 'Warehouse Setting',+ customer: 'Customer Info',+ supplier: 'Supplier Info',+ roleMenu: 'Role Menu Settings',+ stockManagement: 'Stock Management',+ warehouseWorkingModule: 'Warehouse Working',+ warehouseProcessing: 'Warehouse Processing',+ warehouseMove: 'Inventory Move',+ warehouseFreeze: 'Inventory freeze',+ warehouseAdjust: 'Inventory Adjust',+ warehouseTaking: 'Inventory Take',+ deliveryManagement: 'Delivery Management',+ stockAsn: 'Receiving Management'}},login: {welcomeTitle: 'Welcome to ModernWMS!👋🏻',- userNameMustInput: 'Please fill in the userName!',- passwordMustInput: 'Please fill in the password!',mainButtonLabel: 'Login',rememberTips: 'Remember me',userName: 'UserName',- password: 'Password'+ password: 'Password',+ loginSuccess: 'Login succeeded!',+ notAuthority: 'Undistributed menu access the account, please contact the administrator to add it!',+ registerTips: 'No account? Click here to register!',+ register: 'Register'+ },+ homepage: {+ subTitle: 'Modern Warehouse Management System'+ },+ base: {+ freightSetting: {+ carrier: 'carrier',+ departure_city: 'Departure City',+ arrival_city: 'Arrival City',+ price_per_weight: 'Weight Fee',+ price_per_volume: 'Volume Fee',+ min_payment: 'Min Payment',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid',+ freightSelectModal: 'Freight Select Modal',+ },+ userManagement: {+ user_num: 'User Num',+ user_name: 'User Name',+ user_role: 'Role',+ contact_tel: 'Contact Information',+ sex: 'Sex',+ is_valid: 'Valid',+ restPwd: 'Reset password',+ checkboxIsNull: 'Please select data!',+ beforeResetPwd: 'Are you sure you want to reset the passwords of these users?',+ afterResetPwd: 'Password reset succeeded, The new password is ',+ user_register_name: 'User Name',+ email: 'Email',+ auth_string: 'Password'+ },+ warehouseSetting: {+ warehouseSetting: 'Warehouse Setting',+ reservoirSetting: 'Reservoir Setting',+ locationSetting: 'Location Setting',+ locationSelectModal: 'Location Select Modal',+ email: 'Email',+ warehouse_name: 'Warehouse Name',+ city: 'City',+ address: 'Address',+ contact_tel: 'Acontact Tel',+ manager: 'Manager',+ is_valid: 'Valid',+ area_name: 'Reservoir Name',+ area_property: 'Reservoir Category',+ location_name: 'Location Code',+ location_length: 'Location Length(m)',+ location_width: 'Location Width(m)',+ location_heigth: 'Location Height(m)',+ location_volume: 'Location Volume(m³)',+ location_load: 'Location Load(kg)',+ roadway_number: 'Roadway Number',+ shelf_number: 'Shelf Number',+ layer_number: 'Layer Number',+ tag_number: 'Tag Number',+ picking_area: 'Picking Area',+ stocking_area: 'Stocking Area',+ receiving_area: 'Receiving Area',+ return_area: 'Return Area',+ defective_area: 'Defective Area',+ inventory_area: 'Inventory Area',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time'+ },+ customer: {+ customer_name: 'Customer Name',+ city: 'City',+ address: 'Address',+ manager: 'Manager',+ email: 'Email',+ contact_tel: 'Contact Tel',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid'+ },+ supplier: {+ supplier_name: 'Supplier Name',+ city: 'City',+ address: 'Address',+ email: 'Email',+ manager: 'Manager',+ contact_tel: 'Contact Tel',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid'+ },+ userRoleSetting: {+ role_name: 'User Role',+ is_valid: 'Valid'+ },+ companySetting: {+ company_name: 'Corporate Name',+ city: 'City',+ address: 'Detailed Address',+ manager: 'Person In Charge',+ contact_tel: 'Contact Information'+ },+ ownerOfCargo: {+ goods_owner_name: 'Owner Of Cargo',+ city: 'City',+ address: 'Detailed Address',+ manager: 'Person In Charge',+ contact_tel: 'Contact Information',+ creator: 'Creator',+ create_time: 'Create Time'+ },+ commodityCategorySetting: {+ category_name: 'Commodity category',+ parent_name: 'Parent Category',+ creator: 'Creator',+ create_time: 'Create Time'+ },+ roleMenu: {+ role_name: 'Role Name',+ menu_name: 'Menu Name',+ beforeUpdateOrDel: 'Please select the data to be processed first!'+ },+ commodityManagement: {+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ category_name: 'Commodity Category',+ spu_description: 'Commodity Description',+ bar_code: 'Specification Code',+ sku_code: 'Specification Code',+ sku_name: 'Specification Name',+ supplier_name: 'Supplier Name',+ brand: 'Brand',+ unit: 'Commodity Unit',+ cost: 'Commodity Cost',+ price: 'Commodity Price',+ origin: 'origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ weight: 'Commodity Weight',+ lenght: 'Commodity Length',+ width: 'Commodity Width',+ height: 'Commodity Height',+ volume: 'Commodity Volume'+ }+ },+ wms: {+ stock: {+ stockSelectModal: 'Stock Select Modal',+ skuSelectModal: 'Commodity Select Modal',+ warehouse: 'Warehouse Name',+ location_name: 'Location Code',+ qty_available: 'Available Qty'+ },+ warehouseWorking: {+ warehouseProcessing: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ process_status: 'Process Status',+ processor: 'Processor',+ process_time: 'Process Time',+ qty: 'Qty',+ is_source: 'Is Source',+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ sku_code: 'Specification Code',+ sku_name: 'Specification Name',+ target_warehouse: 'Target Warehouse',+ target_location: 'Target Location',+ unit: 'Unit',+ is_update_stock: 'Is Updated Stock',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ adjust_status: 'Is Updated Stock',+ source: 'Source',+ target: 'Target',+ process_split: 'Split Processing',+ process_combine: 'Combine Processing',+ confirmProcess: 'Confirm Process',+ confirmAdjust: 'Confirm Adjust',+ qtyMoreThanAvailable: 'Can\'t more than the number of Available',+ beforeConfirmProcess: 'Are you sure to process this data?',+ beforeConfirmAdjust: 'Are you sure to adjust this data?',+ alreadyProcess: 'The data can\'t delete because it had been processed',+ alreadyAdjust: 'The data can\'t delete because it had been adjusted'+ },+ warehouseMove: {+ job_code: 'Job No',+ move_status: 'Move Status',+ qty: 'Qty',+ handler: 'Handler',+ handle_time: 'Handle Time',+ orig_goods_warehouse: 'Origin Warehouse',+ orig_goods_location_name: 'Origin Location',+ dest_googs_warehouse: 'Target Warehouse',+ dest_googs_location_name: 'Target Location',+ confirmMove: 'Confirm Move',+ creator: 'Creator',+ create_time: 'Create Time',+ beforeConfirmMove: 'Are you sure to move this data?',+ unadjust: 'Unadjust',+ adjusted: 'Adjusted'+ },+ warehouseFreeze: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ freeze: 'Freeze',+ unfreeze: 'Unfreeze'+ },+ warehouseAdjust: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ qty: 'Difference Qty',+ warehouseTake: 'Warehouse Take',+ processCombine: 'Warehouse Process',+ processSplit: 'Warehouse Process',+ warehouseMove: 'Warehouse Move',+ confirmAdjust: 'Confirm Adjust',+ beforeConfirmAdjust: 'Are you sure to adjust this data?'+ },+ warehouseTaking: {+ job_code: 'Job Code',+ job_status: 'Job Status',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ book_qty: 'Book Qty',+ counted_qty: 'Actual Qty',+ difference_qty: 'Difference Qty',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ confirmTaking: 'Confirm Taking',+ unfinish: 'Unfinish',+ finish: 'Finish',+ confirmAdjust: 'Confirm Adjust',+ beforeConfirmAdjust: 'Are you sure to adjust this data?',+ 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'+ }+ },+ stockManagement: {+ stockLocation: 'Stock Location',+ stock: 'Stock'+ },+ stockLocation: {+ warehouse_name: 'Warehouse',+ location_name: 'Location Code',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ qty: 'Quantity',+ qty_available: 'Available Quantity',+ qty_locked: 'Locked Quantity',+ qty_frozen: 'Frozen Quantity'+ },+ stockList: {+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_code: 'Specification code',+ sku_id: 'Sku Id',+ qty: 'Quantity',+ qty_available: 'Available Quantity',+ qty_locked: 'Locked Quantity',+ qty_frozen: 'Frozen Quantity',+ qty_asn: 'Asn Quantity',+ qty_to_unload: 'Unload Quantity',+ qty_to_sort: 'Sort Quantity',+ qty_sorted: 'Sorted Quantity',+ shortage_qty: 'Shortage Quantity'+ },+ stockAsn: {+ tabNotice: 'Notice Of Arrival',+ tabToDoArrival: 'To Be Delivered',+ tabToDoUnload: 'To Be Unloaded',+ tabToDoSorting: 'To Be Sorted',+ tabToDoGrounding: 'To Be Put On The Shelf',+ tabReceiptDetails: 'Receipt Details'+ },+ stockAsnInfo: {+ id: 'ID',+ asn_no: 'Asn No',+ asn_status: 'Asn Status',+ spu_id: 'Spu Id',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ origin: 'Origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ asn_qty: 'Asn Quantity',+ actual_qty: 'Actual Quantity',+ sorted_qty: 'Sorted Quantity',+ shortage_qty: 'Shortage Quantity',+ more_qty: 'More Quantity',+ damage_qty: 'Damage Quantity',+ weight: 'Weight',+ volume: 'Volume',+ supplier_id: 'Supplier Id',+ supplier_name: 'Supplier Name',+ goods_owner_id: 'Goods Owner Id',+ goods_owner_name: 'Goods Owner Name',+ is_valid: 'Valid'+ },+ skuInfo: {+ spu_id: 'Spu Id',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ category_id: 'Commodity Category ID',+ category_name: 'Commodity Category',+ spu_description: 'Commodity Description',+ bar_code: 'Specification Code',+ supplier_id: 'Supplier Id',+ supplier_name: 'Supplier Name',+ brand: 'Brand',+ origin: 'origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ weight: 'Commodity Weight',+ lenght: 'Commodity Length',+ width: 'Commodity Width',+ height: 'Commodity Height',+ volume: 'Commodity Volume',+ unit: 'Commodity Unit',+ cost: 'Commodity Cost',+ price: 'Commodity Price'+ },+ deliveryManagement: {+ shipment: 'Invoice',+ preShipment: 'Pre Shipment',+ newShipment: 'New Shipment',+ goodsToBePicked: 'Goods To Be Picked',+ picked: 'Picked',+ toBePackaged: 'To Be Packaged',+ package: 'Pack',+ packaged: 'Packaged',+ toBeWeighed: 'To Be Weighed',+ weigh: 'Weigh',+ weighed: 'Weighed',+ delivery: 'Delivery',+ toBeDelivered: 'To Be Delivered',+ outOfWarehouse: 'Out Of Warehouse',+ signIn: 'Sign In',+ signedIn: 'Signed In',+ dispatch_no: 'Shipment No',+ dispatch_status: 'Shipment Doc Status',+ qty: 'Total Quantity',+ detailQty: 'Quantity',+ weight: 'Total Weight',+ volume: 'Total Volume',+ customer_name: 'Customer Name',+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ sku_code: 'Specification Code',+ creator: 'Created By',+ create_time: 'Creation Time',+ confirmOrder: 'Confirm Shipment Doc',+ orderDetail: 'Shipment Order Product Details',+ quantityOverflow: 'The sum of shipment quantity cannot exceed the shipment document quantity',+ quantityIsZero: 'Please ensure that at least one of the selected goods has an issue quantity greater than 0!',+ NoItemSelected: 'Please select at least one commodity to delivered!',+ confirmSuccess: 'Confirm the shipment order successfully!',+ confirmPicking: 'Confirm Picking',+ confirmDelivery: 'Confirm Delivery',+ confirmSignIn: 'Confirm Signing',+ detailWeight: 'Weight',+ unpackage_qty: 'Quantity to be packaged',+ unweighing_qty: 'Quantity to be weighed',+ validQtyMsgPackage: 'Please enter a valid value, which cannot exceed the total quantity',+ validQtyMsgSignIn: 'Please enter a valid value',+ signInQty: 'Actual signed in quantity',+ incorrectStatusMsg: 'Operation failed, the status should be',+ backToThePreviousStep: 'Recall to previous process',+ confirmBack: 'Confirm withdrawal',+ or: ' or ',+ irreversible: 'This operation is irreversible',+ detailQuantityIsZero: 'Shipment quantity cannot be 0',+ qty_available: 'Available Quantity',+ spu_description: 'Product Description',+ bar_code: 'Bar Code',+ order_qty: 'Order Quantity',+ unpicked_qty: 'Quantity to be picked',+ picked_qty: 'Picked Quantity',+ detailVolume: 'Volume',+ package_qty: 'Packed Quantity',+ package_person: 'Packer',+ package_time: 'Packaging Time',+ weighing_no: 'Weighing sheet No',+ package_no: 'Packaging serial No',+ weighing_person: 'Weigher',+ weighing_weight: 'Weighing Weight',+ waybill_no: 'Waybill No',+ carrier: 'Carrier',+ damagedQuantity: 'Damaged quantity upon arrival',+ setFreight: 'Set Carrier',+ departure_city: 'Originating city',+ arrival_city: 'City of arrival',+ ViewInventoryDetails: 'View product details',+ invalidValue: 'Please enter a valid value',+ exceedingQuantity: 'Cannot exceed the total quantity'+ }}}diff --git a/frontend/src/languages/langs/index.ts b/frontend/src/languages/langs/index.tsindex 34fd605..72934b0 100644--- a/frontend/src/languages/langs/index.ts+++ b/frontend/src/languages/langs/index.ts@@ -1,7 +1,16 @@+import zhCN from 'vxe-table/lib/locale/lang/zh-CN'+import enUS from 'vxe-table/lib/locale/lang/en-US'+import en from './enUs'import cn from './cnZh'export default {- zh_CN: cn,- en_US: en+ zh_CN: {+ ...cn,+ ...zhCN+ },+ en_US: {+ ...en,+ ...enUS+ }}diff --git a/frontend/src/main.ts b/frontend/src/main.tsindex 26da314..3a8b75c 100644--- a/frontend/src/main.ts+++ b/frontend/src/main.ts@@ -1,21 +1,26 @@import { createApp } from 'vue'import './style.css' // Global Styles+import { VXETable } from '@/plugins/VXETable/index'import { vuetify } from '@/plugins/vuetify/index'import i18n from './languages/i18n'-import App from './App.vue'// import routerimport { router } from './router'import { store } from './store/index'-import hookComponent from '@/components/common/function/index'+import hookComponent from '@/components/system/index'const app = createApp(App)+VXETable.setup({+ i18n: (key, args) => i18n.global.t(key, args)+})+app.use(router)app.use(store)app.use(vuetify)app.use(i18n)app.use(hookComponent)+app.use(VXETable)app.mount('#app')diff --git a/frontend/src/plugins/VXETable/index.ts b/frontend/src/plugins/VXETable/index.tsnew file mode 100644index 0000000..7e94da1--- /dev/null+++ b/frontend/src/plugins/VXETable/index.ts@@ -0,0 +1,20 @@+import VXETable from 'vxe-table'+import XEUtils from 'xe-utils'+import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'+import 'vxe-table/lib/style.css'++/**+ * Format date.+ * @param {String} format: default value is 'yyyy-MM-dd HH:mm:ss'+ */+VXETable.formats.add('formatDate', ({ cellValue }, format) => {+ const date = new Date(cellValue)+ if (!cellValue || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01') {+ return ''+ }+ return XEUtils.toDateString(date, format || 'yyyy-MM-dd HH:mm:ss')+})++VXETable.use(VXETablePluginExportXLSX)++export { VXETable }diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.tsindex 0345482..6e9e89d 100644--- a/frontend/src/router/index.ts+++ b/frontend/src/router/index.ts@@ -1,7 +1,8 @@// index.tsimport { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'import { store } from '@/store'-import { CustomerRouterProps } from '@/types/system/router'+import { CustomerRouterProps } from '@/types/System/Router'+import { menusToRouter } from '@/utils/router'// array => dynamic routerlet dynamicRouter: CustomerRouterProps[] = []@@ -16,12 +17,13 @@ const routes: RouteRecordRaw[] = [{path: '/login',name: 'login',- component: () => import('@/view/Login/login.vue')+ component: () => import('@/view/login/login.vue')},{name: 'home',path: '/home',- component: () => import('@/view/Home/home.vue'),+ redirect: 'homepage',+ component: () => import('@/view/home/home.vue'),children: []}]@@ -30,7 +32,7 @@ const routes: RouteRecordRaw[] = [const router = createRouter({// mode is hashhistory: createWebHashHistory(),- routes,+ routes// Return to top after route jump// scrollBehavior() {// return { top: 0 }@@ -41,8 +43,15 @@ const router = createRouter({const modules = import.meta.glob('../view/*/*/*.vue')// load router function-export function loadRouter() {- dynamicRouter = store.getters['user/menulist']+function loadRouter() {+ dynamicRouter = menusToRouter(store.getters['user/menulist'])+ dynamicRouter.push({+ name: 'homepage',+ path: '/homepage',+ directory: 'home/homepage',+ redirect: '',+ component: null+ })// Clear the loaded routes before creating them, mainly for logged out usersfor (const item of loadedRouter) {router.removeRoute(item)@@ -51,6 +60,10 @@ export function loadRouter() {// This works normally, but it doesn't seem right when getting routerfor (const item of dynamicRouter) {item.component = modules[`../view/${ item.directory }${ item.path }.vue`]+ item.meta = {+ menuModule: item.module,+ menuPath: item.name+ }router.addRoute('home', item)loadedRouter.push(item.name) // cache dynamic router}@@ -65,9 +78,9 @@ router.beforeEach((to, from, next) => {}// dont have token, back login- // if (!store.getters['user/token']) {- // return next('/login')- // }+ if (!store.getters['user/token']) {+ return next('/login')+ }if (dynamicRouter.length === 0) {loadRouter()@@ -77,9 +90,10 @@ router.beforeEach((to, from, next) => {next()})-// disable back or forward-// router.afterEach(() => {-// window.history.pushState(null, '', window.location.href)-// })+// Route interceptor, after jump+router.afterEach(() => {+ // disable back or forward+ window.history.pushState(null, '', window.location.href)+})export { router }diff --git a/frontend/src/shims.axios.d.ts b/frontend/src/shims.axios.d.tsnew file mode 100644index 0000000..057fd05--- /dev/null+++ b/frontend/src/shims.axios.d.ts@@ -0,0 +1,7 @@+import { AxiosRequestConfig } from 'axios'++declare module 'axios' {+ export interface AxiosRequestConfig {+ hideLoading?: boolean+ }+}diff --git a/frontend/src/store/module/system.ts b/frontend/src/store/module/system.tsindex 2b126c9..bbf5196 100644--- a/frontend/src/store/module/system.ts+++ b/frontend/src/store/module/system.ts@@ -1,40 +1,66 @@-interface stateProps {- language: string- openedMenus: string[]-}+import { StateProps } from '@/types/System/Store'export const system = {namespaced: true,state: {language: '',- openedMenus: []+ openedMenus: [],+ // Window Size+ clientWidth: 0,+ clientHeight: 0,+ currentRouterPath: '',+ refreshFlag: false},mutations: {- setLanguage(state: stateProps, lang: string) {+ setCurrentRouterPath(state: StateProps, path: string) {+ state.currentRouterPath = path+ },+ setRefreshFlag(state: StateProps, flag: boolean) {+ state.refreshFlag = flag+ },+ setLanguage(state: StateProps, lang: string) {state.language = lang},- addOpenedMenu(state: stateProps, menuName: string) {+ addOpenedMenu(state: StateProps, menuName: string) {if (!state.openedMenus.includes(menuName)) {state.openedMenus.push(menuName)}},- delOpenedMenu(state: stateProps, menuName: string) {+ delOpenedMenu(state: StateProps, menuName: string) {const menuIndex = state.openedMenus.findIndex((item) => item === menuName)if (menuIndex > -1) {state.openedMenus.splice(menuIndex, 1)}},- clearOpenedMenu(state: stateProps) {+ clearOpenedMenu(state: StateProps) {state.openedMenus = []+ },+ setClientWidth(state: StateProps, clientWidth: number) {+ state.clientWidth = clientWidth+ },+ setClientHeight(state: StateProps, clientHeight: number) {+ state.clientHeight = clientHeight}},actions: {},getters: {- language(state: stateProps) {+ currentRouterPath(state: StateProps) {+ return state.currentRouterPath+ },+ language(state: StateProps) {return state.language},- openedMenus(state: stateProps) {+ openedMenus(state: StateProps) {return state.openedMenus+ },+ clientWidth(state: StateProps) {+ return state.clientWidth+ },+ clientHeight(state: StateProps) {+ return state.clientHeight+ },+ refreshFlag(state: StateProps) {+ return state.refreshFlag}}}diff --git a/frontend/src/store/module/user.ts b/frontend/src/store/module/user.tsindex 1217b86..fb7d90e 100644--- a/frontend/src/store/module/user.ts+++ b/frontend/src/store/module/user.ts@@ -1,9 +1,8 @@-// interface UserInfo {}+import { UserStateProps, MenuItem } from '@/types/System/Store'export const user = {namespaced: true,state: {- // TODO userInfo 类userInfo: {},token: '',// 用于刷新token用的串@@ -15,7 +14,6 @@ export const user = {// 当前是否正在refreshTokenisRefreshingToken: false,// 菜单权限- // 目前用于测试menulist: [// {// name: 'testmenu',@@ -25,55 +23,52 @@ export const user = {]},mutations: {- setUserInfo(state: any, userInfo: any) {- // 这里的 `state` 对象是模块的局部状态+ setUserInfo(state: UserStateProps, userInfo: any) {state.userInfo = userInfo},- resetUserInfo(state: any, userInfo = {}) {+ resetUserInfo(state: UserStateProps, userInfo = {}) {state.userInfo = { ...state.userInfo, ...userInfo }},- setToken(state: any, token: string) {- // 这里的 `state` 对象是模块的局部状态+ setToken(state: UserStateProps, token: string) {state.token = token},- setExpirationTime(state: any, expirationTime: number) {- // 这里的 `state` 对象是模块的局部状态+ setExpirationTime(state: UserStateProps, expirationTime: number) {state.expirationTime = expirationTime},- setIsRefreshingToken(state: any, isRefreshingToken: boolean) {- // 这里的 `state` 对象是模块的局部状态+ setIsRefreshingToken(state: UserStateProps, isRefreshingToken: boolean) {state.isRefreshingToken = isRefreshingToken},- setRefreshToken(state: any, refreshToken: string) {- // 这里的 `state` 对象是模块的局部状态+ setRefreshToken(state: UserStateProps, refreshToken: string) {state.refreshToken = refreshToken},- setEffectiveMinutes(state: any, effectiveMinutes: number) {- // 这里的 `state` 对象是模块的局部状态+ setEffectiveMinutes(state: UserStateProps, effectiveMinutes: number) {state.effectiveMinutes = effectiveMinutes+ },+ setUserMenuList(state: UserStateProps, menulist: MenuItem[]) {+ state.menulist = menulist}},actions: {},getters: {- userInfo(state: any) {+ userInfo(state: UserStateProps) {return state.userInfo},- token(state: any) {+ token(state: UserStateProps) {return state.token},- expirationTime(state: any) {+ expirationTime(state: UserStateProps) {return state.expirationTime},- isRefreshingToken(state: any) {+ isRefreshingToken(state: UserStateProps) {return state.isRefreshingToken},- refreshToken(state: any) {+ refreshToken(state: UserStateProps) {return state.refreshToken},- effectiveMinutes(state: any) {+ effectiveMinutes(state: UserStateProps) {return state.effectiveMinutes},- menulist(state: any) {+ menulist(state: UserStateProps) {return state.menulist}}diff --git a/frontend/src/types/Base/CommodityCategorySetting.ts b/frontend/src/types/Base/CommodityCategorySetting.tsnew file mode 100644index 0000000..a90dc8c--- /dev/null+++ b/frontend/src/types/Base/CommodityCategorySetting.ts@@ -0,0 +1,16 @@+import { VxeTablePropTypes } from 'vxe-table'+import { UniformFileNaming } from '../System/Form'++export interface CategoryVO extends UniformFileNaming {+ id: number+ parent_id?: number+ category_name: string+ is_valid?: boolean+}++export interface DataProps {+ tableData: CategoryVO[]+ tableTreeConfig: VxeTablePropTypes.TreeConfig+ showDialog: boolean+ dialogForm: CategoryVO+}diff --git a/frontend/src/types/Base/CommodityManagement.ts b/frontend/src/types/Base/CommodityManagement.tsnew file mode 100644index 0000000..c3dba4a--- /dev/null+++ b/frontend/src/types/Base/CommodityManagement.ts@@ -0,0 +1,62 @@+import { VxeTablePropTypes } from 'vxe-table'+import { UniformFileNaming, TablePage } from '../System/Form'++export interface CommodityVO extends UniformFileNaming {+ id: number+ spu_code: string+ spu_name: string+ category_id?: number+ category_name?: string+ spu_description: string+ bar_code: string+ supplier_id?: number+ supplier_name?: string+ brand: string+ origin?: string+ length_unit: number+ volume_unit: number+ weight_unit: number+ detailList?: CommodityDetailVO[]+}++export interface CommodityDetailVO {+ id: number+ sku_code: string+ sku_name: string+ unit: string+ cost?: number+ price?: number+ weight?: number+ lenght?: number+ width?: number+ height?: number+ volume?: number+}++export interface CommodityDetailJoinMainVO {+ sku_id: number+ spu_id: number+ spu_code: string+ spu_name: string+ sku_code: string+ sku_name: string+ supplier_id: number+ supplier_name: string+ brand: string+ origin: string+ unit: string+}++export interface DataProps {+ tableData: CommodityVO[]+ tableTreeConfig: VxeTablePropTypes.TreeConfig+ showDialog: boolean+ dialogForm: CommodityVO+ tablePage: TablePage+ searchForm: {+ spu_code: string+ spu_name: string+ category_name: string+ },+ timer: any+}diff --git a/frontend/src/types/Base/CompanySetting.ts b/frontend/src/types/Base/CompanySetting.tsnew file mode 100644index 0000000..335dafe--- /dev/null+++ b/frontend/src/types/Base/CompanySetting.ts@@ -0,0 +1,16 @@+import { UniformFileNaming } from '../System/Form'++export interface CompanyVO extends UniformFileNaming {+ id: number+ company_name: string+ city: string+ address: string+ manager: string+ contact_tel: string+}++export interface DataProps {+ tableData: CompanyVO[]+ showDialog: boolean+ dialogForm: CompanyVO+}diff --git a/frontend/src/types/Base/Customer.ts b/frontend/src/types/Base/Customer.tsnew file mode 100644index 0000000..229e7cf--- /dev/null+++ b/frontend/src/types/Base/Customer.ts@@ -0,0 +1,28 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface CustomerVO extends UniformFileNaming {+ id: number+ customer_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+ is_valid: boolean+}+export interface CustomerExcelVO {+ customer_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+ _XID: string+ errorMsg: string+}+export interface DataProps {+ tableData: CustomerVO[]+ tablePage: TablePage+ showDialog: boolean+ dialogForm: CustomerVO+}diff --git a/frontend/src/types/Base/Freight.ts b/frontend/src/types/Base/Freight.tsnew file mode 100644index 0000000..ef39332--- /dev/null+++ b/frontend/src/types/Base/Freight.ts@@ -0,0 +1,12 @@+import { UniformFileNaming } from '../System/Form'++export interface FreightVO extends UniformFileNaming{+ id?: number+ carrier: string+ departure_city: string+ arrival_city: string+ price_per_weight: number+ price_per_volume: number+ min_payment: number+ is_valid?: boolean+}\ No newline at end of filediff --git a/frontend/src/types/Base/OwnerOfCargo.ts b/frontend/src/types/Base/OwnerOfCargo.tsnew file mode 100644index 0000000..c98c607--- /dev/null+++ b/frontend/src/types/Base/OwnerOfCargo.ts@@ -0,0 +1,30 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface OwnerOfCargoVO extends UniformFileNaming {+ id: number+ goods_owner_name: string+ city: string+ address: string+ contact_tel: string+ manager: string+}++export interface ImportVO {+ goods_owner_name: string+ city: string+ address: string+ contact_tel: string+ manager: string+}++export interface DataProps {+ tableData: OwnerOfCargoVO[]+ showDialog: boolean+ showDialogImport: boolean+ dialogForm: OwnerOfCargoVO+ searchForm: {+ goods_owner_name: string+ }+ tablePage: TablePage+ timer: any+}diff --git a/frontend/src/types/Base/RoleMenu.ts b/frontend/src/types/Base/RoleMenu.tsnew file mode 100644index 0000000..8466ab7--- /dev/null+++ b/frontend/src/types/Base/RoleMenu.ts@@ -0,0 +1,21 @@+import { NavListOptions, UniformFileNaming, VxeTableRow } from '../System/Form'++export interface RoleMenuVO extends UniformFileNaming {+ userrole_id?: number+ role_name?: string+ detailList: RoleMenuDetailVo[]+}++export interface RoleMenuDetailVo extends VxeTableRow {+ id: number+ menu_id?: number+ menu_name?: string+}++export interface DataProps {+ activeRoleMenuForm: RoleMenuVO+ roleList: RoleMenuVO[]+ showDialog: boolean+ dialogForm: RoleMenuVO+ navListOptions: NavListOptions+}diff --git a/frontend/src/types/Base/Supplier.ts b/frontend/src/types/Base/Supplier.tsnew file mode 100644index 0000000..ddeac2a--- /dev/null+++ b/frontend/src/types/Base/Supplier.ts@@ -0,0 +1,28 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface SupplierVO extends UniformFileNaming {+ id: number+ supplier_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+ is_valid: boolean+}++export interface SupplierExcelVO {+ supplier_name: string+ city: string+ address: string+ manager: string+ email: string+ contact_tel: string+}++export interface DataProps {+ tableData: SupplierVO[]+ tablePage: TablePage+ showDialog: boolean+ dialogForm: SupplierVO+}diff --git a/frontend/src/types/Base/UserManagement.ts b/frontend/src/types/Base/UserManagement.tsnew file mode 100644index 0000000..999f292--- /dev/null+++ b/frontend/src/types/Base/UserManagement.ts@@ -0,0 +1,42 @@+import { UniformFileNaming, TablePage } from '../System/Form'++export interface UserVO extends UniformFileNaming {+ id: number+ user_num: string+ user_name: string+ contact_tel?: string+ user_role?: string+ sex?: string+ auth_string?: string+ email?: string+ is_valid: boolean+}++export interface ImportVO {+ user_num: string+ user_name: string+ contact_tel: string+ user_role: string+ sex: string+ is_valid: boolean+}++export interface DataProps {+ showDialogImport: boolean+ tableData: UserVO[]+ searchForm: {+ user_num: string+ user_name: string+ user_role: string+ }+ tablePage: TablePage+ showDialog: boolean+ dialogForm: UserVO+ timer: any+}++export interface ChangePwdAPIParams {+ id: number+ old_password: string+ new_password: string+}diff --git a/frontend/src/types/Base/UserRoleSetting.ts b/frontend/src/types/Base/UserRoleSetting.tsnew file mode 100644index 0000000..cb81de7--- /dev/null+++ b/frontend/src/types/Base/UserRoleSetting.ts@@ -0,0 +1,13 @@+import { UniformFileNaming } from '../System/Form'++export interface UserRoleVO extends UniformFileNaming {+ id: number+ role_name: string+ is_valid: boolean+}++export interface DataProps {+ tableData: UserRoleVO[]+ showDialog: boolean+ dialogForm: UserRoleVO+}diff --git a/frontend/src/types/Base/Warehouse.ts b/frontend/src/types/Base/Warehouse.tsnew file mode 100644index 0000000..2baae73--- /dev/null+++ b/frontend/src/types/Base/Warehouse.ts@@ -0,0 +1,51 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseVO extends UniformFileNaming {+ id?: number+ warehouse_name: string+ city: string+ address: string+ contact_tel?: string+ email?: string+ manager?: string+ is_valid?: boolean+}++export interface WarehouseAreaVO extends UniformFileNaming {+ id: number+ warehouse_id?: number+ parent_id?: number+ warehouse_name: string+ area_name: string+ area_property: AreaProperty+ is_valid: boolean+}++export interface GoodsLocationVO extends UniformFileNaming {+ id: number+ warehouse_id?: number+ warehouse_area_id?: number+ warehouse_name: string+ warehouse_area_name: string+ warehouse_area_property?: number+ location_name: string+ location_length?: number+ location_width?: number+ location_heigth?: number+ location_volume?: number+ location_load?: number+ roadway_number?: string+ shelf_number?: string+ layer_number?: string+ tag_number?: string+ is_valid: boolean+}++export enum AreaProperty {+ 'picking_area' = 1,+ 'stocking_area' = 2,+ 'receiving_area' = 3,+ 'return_area' = 4,+ 'defective_area' = 5,+ 'inventory_area' = 6+}diff --git a/frontend/src/types/DeliveryManagement/DeliveryManagement.ts b/frontend/src/types/DeliveryManagement/DeliveryManagement.tsnew file mode 100644index 0000000..f22957b--- /dev/null+++ b/frontend/src/types/DeliveryManagement/DeliveryManagement.ts@@ -0,0 +1,121 @@+import { UniformFileNaming } from '../System/Form'++export interface DeliveryManagementVO extends UniformFileNaming {+ id: number+ dispatch_no?: string+ dispatch_status?: number+ qty?: number+ weight?: number+ volume?: number+ customer_id?: number+ customer_name?: string+ picked_qty?: number+ detailList: DeliveryManagementDetailListVO[]+}++export interface DeliveryManagementDetailListVO {+ id: number+ qty: number+ sku_id?: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ sku_name?: string+}++export interface DeliveryManagementDetailVO extends DeliveryManagementVO {+ id: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ unpackage_qty?: number+ unweighing_qty?: number+ spu_description?: string+ bar_code?: string+ qty?: number+ unpicked_qty?: number+ picked_qty?: number+ weight?: number+ volume?: number+ weight_unit?: number+}++export interface addRequestVO {+ customer_id: number+ customer_name: string+ sku_id: number+ qty: number+}++export interface ConfirmOrderVO {+ spu_code: string+ sku_code: string+ qty: number+ confirm: boolean+ pick_list: ConfirmOrderPickListVO[]+}++export interface ConfirmOrderPickListVO {+ warehouse_name: string+ location_name: string+ pick_qty: number+}++export interface PackageVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ package_qty?: number+ picked_qty?: number+}++export interface WeighVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ weighing_qty?: number+ weighing_weight?: number+ picked_qty?: number+}++export interface DeliveryVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ picked_qty?: number+}++export interface SignInVO {+ id?: number+ dispatch_no?: string+ dispatch_status?: number+ damage_qty?: number+}++export interface CancleOrderVO {+ dispatch_no?: string+ dispatch_status?: number+}++export interface SetCarrierVO {+ id: number+ dispatch_no: string+ dispatch_status: number+ freightfee_id: number+ carrier: string+ waybill_no: string+}++export interface ConfirmItem {+ id: number+ dispatch_no: string+ dispatch_status: number+ spu_name: string+ spu_code: string+ sku_code: string+ maxQty: number+ qty: number+ picked_qty?: number+ weight?: number+ weight_unit?: string+}diff --git a/frontend/src/types/Home/Home.ts b/frontend/src/types/Home/Home.tsnew file mode 100644index 0000000..437638e--- /dev/null+++ b/frontend/src/types/Home/Home.ts@@ -0,0 +1,12 @@+// test interface+export interface SideBarMenu {+ icon?: string+ lable: string+ routerPath?: string+ showDetail?: boolean+ children?: SideBarMenu[]+}++export interface SideBarDataProps {+ menuList: SideBarMenu[]+}\ No newline at end of filediff --git a/frontend/src/types/Home/HomeHeader.ts b/frontend/src/types/Home/HomeHeader.tsnew file mode 100644index 0000000..228baad--- /dev/null+++ b/frontend/src/types/Home/HomeHeader.ts@@ -0,0 +1,9 @@+export interface DataProps {+ breadcrumbItems: BreadcrumbItems[]+ userOperationMenu: any+}++interface BreadcrumbItems {+ title: string+ disabled: boolean+}diff --git a/frontend/src/types/WMS/StockAsn.ts b/frontend/src/types/WMS/StockAsn.tsnew file mode 100644index 0000000..1c8809d--- /dev/null+++ b/frontend/src/types/WMS/StockAsn.ts@@ -0,0 +1,70 @@+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+}++export interface PutawayVo {+ asn_id: number+ goods_location_id: number+ putaway_qty: number+ location_name: string+}++export interface SortingVo {+ asn_id: number+ sorted_qty: number+}++export interface SkuInfoVo {+ spu_id: number+ spu_code: string+ spu_name: string+ category_id: number+ category_name: string+ spu_description: string+ bar_code: string+ supplier_id: number+ supplier_name: string+ brand: string+ origin: string+ length_unit: number+ volume_unit: number+ weight_unit: number+ sku_id: number+ sku_code: string+ sku_name: string+ weight: number+ lenght: number+ width: number+ height: number+ volume: number+ unit: string+ cost: number+ price: number+}diff --git a/frontend/src/types/WMS/StockManagement.ts b/frontend/src/types/WMS/StockManagement.tsnew file mode 100644index 0000000..b94fff6--- /dev/null+++ b/frontend/src/types/WMS/StockManagement.ts@@ -0,0 +1,29 @@+export interface StockLocationVO {+ warehouse: string+ location_name: string+ spu_code: string+ spu_name: string+ sku_id: number+ sku_code: string+ sku_name: string+ qty: number+ qty_available: number+ qty_locked: number+ qty_frozen: number+}++export interface StockVO {+ spu_code: string+ spu_name: string+ sku_code: string+ sku_id: number+ qty: number+ qty_available: number+ qty_locked: number+ qty_frozen: number+ qty_asn: number+ qty_to_unload: number+ qty_to_sort: number+ qty_sorted: number+ shortage_qty: number+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseAdjust.ts b/frontend/src/types/WarehouseWorking/WarehouseAdjust.tsnew file mode 100644index 0000000..f4ae0dd--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseAdjust.ts@@ -0,0 +1,26 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseAdjustVO extends UniformFileNaming {+ id: number+ job_type?: AdjustJobType+ job_code: string+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ qty: number+ is_update_stock: boolean+ source_table_id: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ warehouse_name?: string+ location_name?: string+}++export enum AdjustJobType {+ UNKNOW = 0,+ TAKE = 1,+ PROCESS_COMBINE = 2,+ PROCESS_SPLIT = 3,+ MOVE = 4+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts b/frontend/src/types/WarehouseWorking/WarehouseFreeze.tsnew file mode 100644index 0000000..09d2745--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseFreeze.ts@@ -0,0 +1,17 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseFreezeVO extends UniformFileNaming {+ id: number+ job_code: string+ job_type: boolean+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ handler: string+ handle_time: string+ warehouse_name: string+ location_name: string+ spu_code: string+ spu_name: string+ sku_code: string+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseMove.ts b/frontend/src/types/WarehouseWorking/WarehouseMove.tsnew file mode 100644index 0000000..44633d8--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseMove.ts@@ -0,0 +1,27 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseMoveVO extends UniformFileNaming {+ id: number+ job_code: string+ move_status: MoveStatus+ sku_id: number+ orig_goods_location_id: number+ dest_googs_location_id: number+ qty: number+ goods_owner_id: number+ handler: string+ handle_time: string+ orig_goods_warehouse: string+ orig_goods_location_name: string+ dest_googs_warehouse: string+ dest_googs_location_name: string+ spu_code: string+ spu_name: string+ sku_code: string+ sku_name: string+}++export enum MoveStatus {+ UNADJUST = 0,+ ADJUSTED = 1+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseProcessing.ts b/frontend/src/types/WarehouseWorking/WarehouseProcessing.tsnew file mode 100644index 0000000..111b0b0--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseProcessing.ts@@ -0,0 +1,31 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseProcessingVO extends UniformFileNaming {+ id: number+ job_code: string+ job_type: boolean+ process_status: boolean+ processor: string+ process_time: string+ source_detail_list?: Array<WarehouseProcessingDetailVO>+ target_detail_list?: Array<WarehouseProcessingDetailVO>+ adjust_status?: boolean+ detailList?: Array<any>+}++export interface WarehouseProcessingDetailVO extends UniformFileNaming {+ id: number+ stock_process_id: number+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ qty: number | string+ is_source: boolean+ spu_code: string+ spu_name: string+ sku_code: string+ unit: string+ is_update_stock: boolean+ qty_available?: number+ location_name?: string+}diff --git a/frontend/src/types/WarehouseWorking/WarehouseTaking.ts b/frontend/src/types/WarehouseWorking/WarehouseTaking.tsnew file mode 100644index 0000000..b4cc40a--- /dev/null+++ b/frontend/src/types/WarehouseWorking/WarehouseTaking.ts@@ -0,0 +1,21 @@+import { UniformFileNaming } from '../System/Form'++export interface WarehouseTakingVO extends UniformFileNaming {+ id: number+ job_code: string+ job_status: boolean+ sku_id: number+ goods_owner_id: number+ goods_location_id: number+ book_qty: number+ counted_qty: number+ difference_qty: number+ spu_code: string+ spu_name: string+ sku_code: string+ warehouse_name: string+ location_name: string+ adjust_status: boolean+ handler: string+ handle_time: string+}diff --git a/frontend/src/types/system/Form.ts b/frontend/src/types/system/Form.tsnew file mode 100644index 0000000..f0e5706--- /dev/null+++ b/frontend/src/types/system/Form.ts@@ -0,0 +1,45 @@+export interface UniformFileNaming {+ creator?: string+ create_time?: string+ last_update_time?: string+ tenant_id?: number+}++// VxeTable Required paging parameters+export interface TablePage {+ total: number+ pageIndex: number+ pageSize: number+ searchObjects?: SearchObject[]+}++export interface NavListOptions {+ title: string+ labelKey: string+ indexKey: string+ indexValue: string+}++// API Required paging parameters+export interface PageConfigProps {+ pageIndex: number+ pageSize: number+ sqlTitle?: string+ searchObjects?: any+}++export interface VxeTableRow {+ _X_ROW_KEY?: string+}++export interface SearchObject {+ name?: string,+ operator?: SearchOperator,+ text?: string,+ value?: string+}++export enum SearchOperator {+ INCLUDE = 6,+ EQUAL = 1+}\ No newline at end of filediff --git a/frontend/src/types/system/Store.ts b/frontend/src/types/system/Store.tsnew file mode 100644index 0000000..d3e2f50--- /dev/null+++ b/frontend/src/types/system/Store.ts@@ -0,0 +1,28 @@+// user+export interface MenuItem {+ id: number+ menu_name: string+ module: string+ vue_path: string+ vue_path_detail: string+ vue_directory: string+}++export interface UserStateProps {+ userInfo: any+ token: string+ refreshToken: string+ expirationTime: number+ effectiveMinutes: number+ isRefreshingToken: boolean+ menulist: MenuItem[]+}++export interface StateProps {+ language: string+ currentRouterPath: string+ openedMenus: string[]+ clientWidth: number+ clientHeight: number+ refreshFlag: boolean+}\ No newline at end of filediff --git a/frontend/src/types/system/UserModel.ts b/frontend/src/types/system/UserModel.tsnew file mode 100644index 0000000..a2b89cf--- /dev/null+++ b/frontend/src/types/system/UserModel.ts@@ -0,0 +1,31 @@+/**+ * @description: Login interface parameters+ */+export interface LoginParams {+ user_name: string+ password: string+}++/**+ * @description: Login interface return value+ */+export interface LoginResultModel {+ userId: string | number+ token: string+}++/**+ * @description: Get user information return value+ */+// export interface GetUserInfoModel {+// // 用户id+// userId: string | number;+// // 用户名+// username: string;+// // 真实名字+// realName: string;+// // 头像+// avatar: string;+// // 介绍+// desc?: string;+// }diff --git a/frontend/src/types/system/hookComponent.ts b/frontend/src/types/system/hookComponent.tsindex a0dce5f..7347aff 100644--- a/frontend/src/types/system/hookComponent.ts+++ b/frontend/src/types/system/hookComponent.ts@@ -18,3 +18,11 @@ export interface MessageOptions {color?: stringmessageWidth?: string | number // message width pixel or percentage}++// Component list+export interface Components {+ // eslint-disable-next-line no-unused-vars+ $message(prop: MessageOptions): void+ // eslint-disable-next-line no-unused-vars+ $dialog(prop: DialogOptions): void+}diff --git a/frontend/src/types/system/router.ts b/frontend/src/types/system/router.tsindex 5cf0194..ca8f595 100644--- a/frontend/src/types/system/router.ts+++ b/frontend/src/types/system/router.ts@@ -1,8 +1,12 @@+import { RouteMeta } from 'vue-router'+export interface CustomerRouterProps {name: string+ module?: stringpath: stringdirectory: stringredirect: stringcomponent: any- children: CustomerRouterProps[]-}\ No newline at end of file+ children?: CustomerRouterProps[]+ meta?: RouteMeta+}diff --git a/frontend/src/utils/common.ts b/frontend/src/utils/common.tsnew file mode 100644index 0000000..6595c84--- /dev/null+++ b/frontend/src/utils/common.ts@@ -0,0 +1,57 @@+import XEUtils from 'xe-utils'+import { SearchObject, SearchOperator } from '@/types/System/Form'++export const setSearchObject = (searchForm: any, preciseSearchCols: string[] = []) => {+ const searchObjects: Array<SearchObject> = []+ try {+ for (const key in searchForm) {+ const str = key as string+ const searchValue = searchForm[str as keyof typeof searchForm]+ let operator = SearchOperator.INCLUDE+ if (preciseSearchCols.includes(key)) {+ operator = SearchOperator.EQUAL+ }++ if (searchValue && searchValue.trim() !== '') {+ searchObjects.push({+ name: key,+ operator,+ text: searchValue,+ value: searchValue+ })+ }+ }+ return searchObjects+ } catch (error) {+ return searchObjects+ }+}++// Remove item what value is 'null' or '' in array+export const removeArrayNull = (array: any) => {+ for (const obj of array) {+ Object.keys(obj).forEach((item) => {+ if (XEUtils.isString(obj[item])) {+ obj[item] = obj[item].replace(/(^\s*)|(\s*$)/g, '')+ }+ if (obj[item] === '' || obj[item] === null) {+ delete obj[item]+ }+ })+ }+ return array+}++// Remove item what value is 'null' or '' in object+export const removeObjectNull = (obj: any) => {+ const copy = JSON.parse(JSON.stringify(obj))+ Object.keys(copy).forEach((item) => {+ if (XEUtils.isString(copy[item])) {+ copy[item] = copy[item].replace(/(^\s*)|(\s*$)/g, '')+ }+ if (copy[item] === '' || copy[item] == null) {+ delete copy[item]+ }+ })+ return copy+}diff --git a/frontend/src/utils/dataVerification/formRule.ts b/frontend/src/utils/dataVerification/formRule.tsnew file mode 100644index 0000000..ad3cf27--- /dev/null+++ b/frontend/src/utils/dataVerification/formRule.ts@@ -0,0 +1,94 @@+import i18n from '@/languages/i18n'++// Judge whether it is integer+export function IsInteger(value: string | number, validNumerical: 'nonNegative' | 'greaterThanZero' | 'noZero', length?: number): string {+ if (typeof value === 'number') {+ value = String(value)+ }+ let validText = ''+ if (value === '' || value == null) {+ return ''+ }+ let re = /^-?[0-9]\d*$/+ let max = 2147483647+ let min = -2147483648+ length = length || 32+ if (length === 8) {+ max = 255+ min = 0+ } else if (length === 16) {+ max = 32767+ min = -32768+ }+ switch (validNumerical) {+ case 'nonNegative':+ re = /^[0-9]\d*$/+ validText = '>=0'+ break+ case 'greaterThanZero':+ re = /^[1-9]\d*$/+ validText = '>0'+ break+ case 'noZero':+ re = /^[-]?[1-9][0-9]*$/+ validText = '!=0'+ break+ }+ const rsCheck = re.test(value)+ if (!rsCheck) {+ return `${ i18n.global.t('system.checkText.mustInput') }${ validText }${ i18n.global.t('system.checkText.integer') }`+ }+ if (Number(value) > max || Number(value) < min) {+ return `${ i18n.global.t('system.checkText.mustInput') }${ min }-${ max }${ i18n.global.t('system.checkText.integer') }`+ }+ return ''+}++// Judge whether it is decimal+export function IsDecimal(+ value: string | number,+ validNumerical: 'nonNegative' | 'greaterThanZero',+ length?: number,+ decimalLength?: number+): string {+ if (typeof value === 'number') {+ value = String(value)+ }+ if (value === '' || value == null) {+ return ''+ }+ let validText = ''+ let reg = /^[-]?\d+(\.\d+)?$/+ switch (validNumerical) {+ case 'nonNegative':+ reg = /^\d+(\.\d+)?$/+ validText = '>=0'+ break+ case 'greaterThanZero':+ reg = /^[+]{0,1}([1-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\.\d+)$|^[+]{0,1}([0]\.(?!0+$)\d{1,})$/+ validText = '>0'+ break+ }+ const rsCheck = reg.test(value)+ if (!rsCheck) {+ return `${ i18n.global.t('system.checkText.pleaseEnter') }${ validText }${ i18n.global.t('system.checkText.decimal') }`+ }+ length = length || 18+ decimalLength = decimalLength || 2+ const arr = value.toString().split('.')+ if (arr.length > 0 && arr[0].length > length - decimalLength) {+ return `${ i18n.global.t('system.checkText.pleaseEnter') }${ length - decimalLength }${ i18n.global.t('system.checkText.inputIntMsg') }`+ }+ if (arr.length > 1 && arr[1].length > decimalLength) {+ return `${ i18n.global.t('system.checkText.pleaseEnter') }${ decimalLength }${ i18n.global.t('system.checkText.inputDecimalMsg') }`+ }+ return ''+}++// Judge string length+export function StringLength(value: string, min: number, max: number) {+ if (value.length < min || value.length > max) {+ return `${ i18n.global.t('system.checkText.lengthValid') }${ min }-${ max }`+ }+ return ''+}\ No newline at end of filediff --git a/frontend/src/utils/dataVerification/page.ts b/frontend/src/utils/dataVerification/page.tsnew file mode 100644index 0000000..c6e6bc9--- /dev/null+++ b/frontend/src/utils/dataVerification/page.ts@@ -0,0 +1,41 @@+/**+ * Duplicate inspection details+ * @param detail Array to be verified+ * @param checkKey Collection of items to be checked in the array object+ * @returns Repeat array+ */+export function checkDetailRepeatGetArry(detail: any[], checkKey: string[]): any[] {+ const repeatArray: any[] = []+ for (const item of detail) {+ let repeat = true+ for (const key of checkKey) {+ if (detail.filter(df => df[key] === item[key]).length === 1) {+ repeat = false+ }+ }+ if (repeat) {+ repeatArray.push(item)+ }+ }+ return repeatArray+}+/**+ * Duplicate inspection details+ * @param detail Array to be verified+ * @param checkKey Collection of items to be checked in the array object+ * @returns Duplicate or not+ */+export function checkDetailRepeatGetBool(detail: any[], checkKey: string[]): boolean {+ for (const item of detail) {+ let repeat = true+ for (const key of checkKey) {+ if (detail.filter(df => df[key] === item[key]).length === 1) {+ repeat = false+ }+ }+ if (repeat) {+ return true+ }+ }+ return false+}diff --git a/frontend/src/utils/dataVerification/tableRule.ts b/frontend/src/utils/dataVerification/tableRule.tsnew file mode 100644index 0000000..4415f31--- /dev/null+++ b/frontend/src/utils/dataVerification/tableRule.ts@@ -0,0 +1,83 @@+import i18n from '@/languages/i18n'++// Judge whether it is integer+export function isInteger(rule: any, value: any) {+ if (rule.hasOwnProperty('cellValue')) {+ value = rule.cellValue+ rule = rule.rule+ }+ return new Promise((resolve, reject) => {+ let validText = ''+ if (value === '' || value == null) {+ resolve(true)+ } else {+ let re = /^-?[0-9]\d*$/+ let max = 2147483647+ let min = -2147483648+ const length = rule.length || 32+ if (length === 8) {+ max = 255+ min = 0+ } else if (length === 16) {+ max = 32767+ min = -32768+ }+ if (rule.validNumerical === 'nonNegative') {+ re = /^[0-9]\d*$/+ validText = '>=0'+ } else if (rule.validNumerical === 'greaterThanZero') {+ re = /^[1-9]\d*$/+ validText = '>0'+ } else if (rule.validNumerical === 'noZero') {+ re = /^[-]?[1-9][0-9]*$/+ validText = '!=0'+ }+ const rsCheck = re.test(value)+ if (!rsCheck) {+ reject(new Error(`${ i18n.global.t('system.checkText.mustInput') }${ validText }${ i18n.global.t('system.checkText.integer') }`))+ } else if (value > max || value < min) {+ reject(new Error(`${ i18n.global.t('system.checkText.mustInput') }${ min }-${ max }${ i18n.global.t('system.checkText.integer') }`))+ } else {+ resolve(true)+ }+ }+ })+}++// Judge whether it is decimal+export function isDecimal(rule: any, value: any): any {+ if (rule.hasOwnProperty('cellValue')) {+ value = rule.cellValue+ rule = rule.rule+ }+ return new Promise((resolve, reject) => {+ if (value === '' || value == null) {+ resolve(true)+ } else {+ let validText = ''+ let reg = /^[-]?\d+(\.\d+)?$/+ if (rule.validNumerical === 'nonNegative') {+ reg = /^\d+(\.\d+)?$/+ validText = '>=0'+ } else if (rule.validNumerical === 'greaterThanZero') {+ reg = /^[+]{0,1}([1-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\.\d+)$|^[+]{0,1}([0]\.(?!0+$)\d{1,})$/+ validText = '>0'+ }+ const rsCheck = reg.test(value)+ if (!rsCheck) {+ reject(new Error(`${ i18n.global.t('system.checkText.pleaseEnter') }${ validText }${ i18n.global.t('system.checkText.decimal') }`))+ } else {+ const length = rule.length || 18+ const decimalLength = rule.decimalLength || 2+ const arr = value.toString().split('.')+ if (arr.length > 0 && arr[0].length > length - decimalLength) {+ reject(new Error(`${ i18n.global.t('system.checkText.pleaseEnter') }${ length - decimalLength }${ i18n.global.t('system.checkText.inputIntMsg') }`))+ } else if (arr.length > 1 && arr[1].length > decimalLength) {+ reject(new Error(`${ i18n.global.t('system.checkText.pleaseEnter') }${ decimalLength }${ i18n.global.t('system.checkText.inputDecimalMsg') }`))+ } else {+ resolve(true)+ }+ }+ }+ })+}diff --git a/frontend/src/utils/exportTable.ts b/frontend/src/utils/exportTable.tsnew file mode 100644index 0000000..8757af1--- /dev/null+++ b/frontend/src/utils/exportTable.ts@@ -0,0 +1,69 @@+import * as XLSX from 'xlsx'+import { hookComponent } from '@/components/system'+import i18n from '@/languages/i18n'+/**+ * Export table+ * Default type is 'xlsx'+ */+export const exportData = ({ table, filename, columnFilterMethod, mode = 'all' }: IExportTable): void => {+ try {+ // 1.Get table header+ const columns = table?.getColumns()+ const theadDOM = table.$el.querySelector('.body--wrapper>.vxe-table--header')+ const theadDOMCopy = theadDOM.cloneNode(true)+ const headerRow = theadDOMCopy.querySelector('.vxe-header--row')+ const headerColumn = theadDOMCopy.querySelectorAll('.vxe-header--column')++ // 2.Get table data+ const bodyDOM = table.$el.querySelector('.body--wrapper>.vxe-table--body')+ const bodyDOMCopy = bodyDOM.cloneNode(true)+ const rowDOMList = bodyDOMCopy.querySelectorAll('.vxe-body--row')++ // 3.Filter header in table+ for (let i = 0; i < columns.length; i++) {+ const column = columns[i]+ if (columnFilterMethod && !columnFilterMethod({ column })) {+ headerRow.removeChild(headerColumn[i])+ }+ }++ // 4.Filter table data in table+ for (let j = 0; j < rowDOMList.length; j++) {+ const row = rowDOMList[j]+ const columnDOMList = row.querySelectorAll('.vxe-body--column')++ for (let i = 0; i < columns.length; i++) {+ const column = columns[i]+ if (columnFilterMethod && !columnFilterMethod({ column })) {+ row.removeChild(columnDOMList[i])+ }+ }+ }++ // 5.Combine table header and data+ const combineDOM = document.createElement('div')+ combineDOM.appendChild(theadDOMCopy)+ if (mode === 'all') {+ combineDOM.appendChild(bodyDOMCopy)+ }++ // 6.Export+ const workBook = XLSX.utils.table_to_book(combineDOM as HTMLElement)+ XLSX.writeFile(workBook, `${ filename }.xlsx`)+ } catch (error) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.page.export') }${ i18n.global.t('system.tips.fail') }`+ })+ }+}++interface IExportTable {+ table: any+ filename?: string+ exceptIndex?: Array<number>+ mode?: 'all' | 'header'+ columnFilterMethod?: FilterMEthod+}++type FilterMEthod = ({ column, row }: any) => booleandiff --git a/frontend/src/utils/format/formatSystem.ts b/frontend/src/utils/format/formatSystem.tsnew file mode 100644index 0000000..8af8882--- /dev/null+++ b/frontend/src/utils/format/formatSystem.ts@@ -0,0 +1,17 @@+import XEUtils from 'xe-utils'+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) => {+ const date = new Date(value)+ if (!value || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01') {+ return ''+ }+ return XEUtils.toDateString(date, format || 'yyyy-MM-dd HH:mm:ss')+}++export const formatString = (value: any): string => {+ if (value == null) return ''+ return value?.toString() || ''+}\ No newline at end of filediff --git a/frontend/src/utils/format/formatWarehouse.ts b/frontend/src/utils/format/formatWarehouse.tsnew file mode 100644index 0000000..9237b49--- /dev/null+++ b/frontend/src/utils/format/formatWarehouse.ts@@ -0,0 +1,21 @@+import { AreaProperty } from '@/types/Base/Warehouse'+import i18n from '@/languages/i18n'++export const formatAreaProperty = (value: number) => {+ switch (value) {+ case AreaProperty.picking_area:+ return i18n.global.t('base.warehouseSetting.picking_area')+ case AreaProperty.stocking_area:+ return i18n.global.t('base.warehouseSetting.stocking_area')+ case AreaProperty.receiving_area:+ return i18n.global.t('base.warehouseSetting.receiving_area')+ case AreaProperty.return_area:+ return i18n.global.t('base.warehouseSetting.return_area')+ case AreaProperty.defective_area:+ return i18n.global.t('base.warehouseSetting.defective_area')+ case AreaProperty.inventory_area:+ return i18n.global.t('base.warehouseSetting.inventory_area')+ default:+ return ''+ }+}diff --git a/frontend/src/utils/format/formatWarehouseWorking.ts b/frontend/src/utils/format/formatWarehouseWorking.tsnew file mode 100644index 0000000..47b91e7--- /dev/null+++ b/frontend/src/utils/format/formatWarehouseWorking.ts@@ -0,0 +1,35 @@+import i18n from '@/languages/i18n'+import { PROCESS_JOB_COMBINE, FREEZE_JOB_FREEZE, TAKING_JOB_FINISH } from '@/constant/warehouseWorking'+import { MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'+import { AdjustJobType } from '@/types/WarehouseWorking/WarehouseAdjust'++export const formatProcessJobType = (value: boolean) => (value === PROCESS_JOB_COMBINE+ ? i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_combine')+ : i18n.global.t('wms.warehouseWorking.warehouseProcessing.process_split'))++export const formatFreezeJobType = (value: boolean) => (value === FREEZE_JOB_FREEZE+ ? i18n.global.t('wms.warehouseWorking.warehouseFreeze.freeze')+ : i18n.global.t('wms.warehouseWorking.warehouseFreeze.unfreeze'))++export const formatMoveStatus = (value: number) => (value === MoveStatus.UNADJUST+ ? i18n.global.t('wms.warehouseWorking.warehouseMove.unadjust')+ : i18n.global.t('wms.warehouseWorking.warehouseMove.adjusted'))++export const formatTakingJobStatus = (value: boolean) => (value === TAKING_JOB_FINISH+ ? i18n.global.t('wms.warehouseWorking.warehouseTaking.finish')+ : i18n.global.t('wms.warehouseWorking.warehouseTaking.unfinish'))++export const formatAdjustJobType = (value: number) => {+ switch (value) {+ case AdjustJobType.TAKE:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseTake')+ case AdjustJobType.PROCESS_COMBINE:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.processCombine')+ case AdjustJobType.PROCESS_SPLIT:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.processSplit')+ case AdjustJobType.MOVE:+ return i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseMove')+ default:+ return ''+ }+}diff --git a/frontend/src/utils/http/request.ts b/frontend/src/utils/http/request.tsindex 52b913e..a4a4fd5 100644--- a/frontend/src/utils/http/request.ts+++ b/frontend/src/utils/http/request.ts@@ -1,13 +1,16 @@import axios from 'axios' // 引入axiosimport { store } from '@/store'import { emitter } from '@/utils/bus.js'+import { router } from '@/router'+import { hookComponent } from '@/components/system'+import i18n from '@/languages/i18n'// Basis of axios-const SERVER_URL = `${import.meta.env.VITE_BASE_PATH}:${import.meta.env.VITE_SERVER_PORT}`+const SERVER_URL = `${ import.meta.env.VITE_BASE_PATH }:${ import.meta.env.VITE_SERVER_PORT }`axios.defaults.baseURL = SERVER_URLconst http = axios.create({baseURL: SERVER_URL,- timeout: 20000+ timeout: 10000})// The interface array request failed@@ -16,7 +19,7 @@ let subscribesArr: Array<any> = []// The count of current requestlet acitveAxios = 0-function pushSubscribeInterface(cb: Function) {+function pushSubscribeInterface(cb: any) {subscribesArr.push(cb)}@@ -33,12 +36,12 @@ function resetSubscribes() {* @returns {boolean}*/function isTokenExpired() {- let expiredTime = store.getters['user/expirationTime']+ const expiredTime = store.getters['user/expirationTime']if (expiredTime) {- // 距离到期还有x秒则判定为到期+ // Distance and x seconds is judged to be dueconst willExpiredSecond = 10 * 60- let nowTime = new Date().getTime()- let willExpired = (expiredTime - nowTime) / 1000 < willExpiredSecond+ const nowTime = new Date().getTime()+ const willExpired = (expiredTime - nowTime) / 1000 < willExpiredSecondreturn willExpired}@@ -46,7 +49,10 @@ function isTokenExpired() {}function rediretToLogin() {- // TODO 重定向回登录页+ store.commit('system/clearOpenedMenu')+ store.commit('system/setCurrentRouterPath', '')++ router.push('/login')}const showLoading = () => {@@ -64,12 +70,12 @@ const closeLoading = () => {}const handleRefreshToken = (token: string) => {- let refreshToken = store.getters['user/refreshToken']+ const refreshToken = store.getters['user/refreshToken']store.commit('user/setIsRefreshingToken', true)axios.post('/refresh-token', {accessToken: token,- refreshToken: refreshToken+ refreshToken}).then(({ data: res }) => {if (res.isSuccess) {@@ -96,42 +102,57 @@ const handleRefreshToken = (token: string) => {http.interceptors.request.use((config: any) => {- const donNeedTokenApi = ['/login']+ const donNeedTokenApi = ['/login', '/user/register']const token = store.getters['user/token']- // const user = store.getters['user/userInfo']++ let culture = 'en-us'+ switch (store.getters['system/language']) {+ case 'zh':+ culture = 'zh-cn'+ break+ case 'en':+ culture = 'en-us'+ break+ }+ config.params ? (config.params.culture = culture) : (config.params = { culture })if (!config.hideLoading) {showLoading()}- // 1.token不存在,退出登录+ // It don't need token to request with some apis.+ if (donNeedTokenApi.includes(config.url)) {+ return config+ }++ // 1.Logout when token isn't existif (!token) {rediretToLogin()return config}- // 2.token存在且未过期,继续正常的请求+ // 2.Request normally when token is exist and in valid dateif (!isTokenExpired() || config.url === '/refresh-token') {config.headers = {'Content-Type': 'application/json',...config.headers}if (config.url && !donNeedTokenApi.includes(config.url)) {- config.headers.Authorization = `Bearer ${token}`+ config.headers.Authorization = `Bearer ${ token }`}return config}- // 3.当前未在刷新token,则需要发起刷新token请求+ // 3.Take a 'refresh token' request when it not in the refreshing.if (!store.getters['user/isRefreshingToken']) {handleRefreshToken(token)}- // 4.将请求失败的接口挂起,等刷新token后补偿调用- let retry = new Promise((resolve) => {+ // 4.Put the fail requests up and initiate them after refresh token+ const retry = new Promise((resolve) => {pushSubscribeInterface((newToken: string) => {- config.headers.Authorization = `Bearer ${newToken}`+ config.headers.Authorization = `Bearer ${ newToken }`resolve(config)})})@@ -139,11 +160,6 @@ http.interceptors.request.use(},(error) => {closeLoading()- // ElMessage({- // showClose: true,- // message: error,- // type: 'error'- // })return error})@@ -151,43 +167,39 @@ http.interceptors.request.use(http.interceptors.response.use((response) => {closeLoading()-- // TODO 根据实际业务修改if (response.data.code === 0 || response.headers.success === 'true') {if (response.headers.msg) {response.data.msg = decodeURI(response.headers.msg)}return response.data}- // ElMessage({- // showClose: true,- // message: response.data.msg || decodeURI(response.headers.msg),- // type: 'error'- // })- if (response.data.data && response.data.data.reload) {- // store.commit('user/LoginOut')- }return response.data.msg ? response.data : response},(error) => {closeLoading()-// 1.There isn't 'error.response' object when request timeoutif (!error.response) {- console.log('请求超时', error.message)+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.requestTimeout')+ })return}// 2.There is response status when request fail but not timeoutswitch (error.response.status) {case 500:- console.log('错误:', 500)+ console.error('error:', 500)breakcase 404:- console.log('错误:', 404)+ console.error('error:', 404)break}+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.requestFail')+ })return error})diff --git a/frontend/src/utils/router/index.ts b/frontend/src/utils/router/index.tsnew file mode 100644index 0000000..cde88c6--- /dev/null+++ b/frontend/src/utils/router/index.ts@@ -0,0 +1,167 @@+import { MenuItem } from '@/types/System/Store'+import { CustomerRouterProps } from '@/types/System/Router'+import { SideBarMenu } from '@/types/Home/Home'+import { store } from '@/store'+import i18n from '@/languages/i18n'++// Convert menu permissions to data required for dynamic routing+export function menusToRouter(menuList: MenuItem[]): CustomerRouterProps[] {+ const result: CustomerRouterProps[] = []+ for (const menu of menuList) {+ result.push({+ name: menu.vue_path,+ module: menu.module,+ path: `/${ menu.vue_path }`,+ directory: menu.vue_directory,+ redirect: '',+ component: null+ })+ }+ return result+}++// Convert the menu permission returned from the back end to the sidebar+export function menusToSideBar(): SideBarMenu[] {+ const result: 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 exists+ const moduleIndex = result.findIndex((item) => item.lable === i18n.global.t(`router.sideBar.${ menu.module }`))+ const lable = GetMenuNameAndModule(menu.vue_path)+ if (lable) {+ // Primary menu+ if (!menu.module) {+ result.push({+ lable,+ icon: GetModuleAndIcon(menu.vue_path),+ routerPath: menu.vue_path+ })+ continue+ }+ // Secondary menu+ if (moduleIndex > -1) {+ result[moduleIndex].children?.push({+ lable,+ icon: GetModuleAndIcon(menu.vue_path),+ routerPath: menu.vue_path+ })+ } else {+ result.push({+ lable: i18n.global.t(`router.sideBar.${ menu.module }`),+ icon: GetModuleAndIcon(menu.module),+ showDetail: false,+ children: [+ {+ lable,+ icon: GetModuleAndIcon(menu.vue_path),+ routerPath: menu.vue_path+ }+ ]+ })+ }+ }+ }+ return result+}++// Get the menu name, module and icon+function GetMenuNameAndModule(path: string): string {+ switch (path) {+ case 'homepage':+ return i18n.global.t('router.sideBar.homepage')+ case 'ownerOfCargo':+ return i18n.global.t('router.sideBar.ownerOfCargo')+ case 'menuBasicSettings':+ return i18n.global.t('router.sideBar.menuBasicSettings')+ case 'userManagement':+ return i18n.global.t('router.sideBar.userManagement')+ case 'commodityCategorySetting':+ return i18n.global.t('router.sideBar.commodityCategorySetting')+ case 'commodityManagement':+ return i18n.global.t('router.sideBar.commodityManagement')+ case 'userRoleSetting':+ return i18n.global.t('router.sideBar.userRoleSetting')+ case 'companySetting':+ return i18n.global.t('router.sideBar.companySetting')+ case 'freightSetting':+ return i18n.global.t('router.sideBar.freightSetting')+ case 'warehouseSetting':+ return i18n.global.t('router.sideBar.warehouseSetting')+ case 'customer':+ return i18n.global.t('router.sideBar.customer')+ case 'supplier':+ return i18n.global.t('router.sideBar.supplier')+ case 'roleMenu':+ return i18n.global.t('router.sideBar.roleMenu')+ case 'stockManagement':+ return i18n.global.t('router.sideBar.stockManagement')+ case 'warehouseProcessing':+ return i18n.global.t('router.sideBar.warehouseProcessing')+ case 'warehouseMove':+ return i18n.global.t('router.sideBar.warehouseMove')+ case 'warehouseFreeze':+ return i18n.global.t('router.sideBar.warehouseFreeze')+ case 'warehouseAdjust':+ return i18n.global.t('router.sideBar.warehouseAdjust')+ case 'warehouseTaking':+ return i18n.global.t('router.sideBar.warehouseTaking')+ case 'deliveryManagement':+ return i18n.global.t('router.sideBar.deliveryManagement')+ case 'stockAsn':+ return i18n.global.t('router.sideBar.stockAsn')+ default:+ return ''+ }+}+function GetModuleAndIcon(name: string) {+ switch (name) {+ case 'baseModule':+ return 'cog'+ case 'homepage':+ return 'home'+ case 'stockManagement':+ return 'warehouse'+ case 'stockAsn':+ return 'home-silo'+ case 'warehouseWorkingModule':+ return 'account-hard-hat-outline '+ case 'deliveryManagement':+ return 'cube-send'+ case 'companySetting':+ return 'office-building'+ case 'roleMenu':+ return 'menu'+ case 'userRoleSetting':+ return 'account-box'+ case 'userManagement':+ return 'account'+ case 'commodityCategorySetting':+ return 'format-list-bulleted-type'+ case 'commodityManagement':+ return 'cart-minus'+ case 'ownerOfCargo':+ return 'account-credit-card'+ case 'freightSetting':+ return 'cash-multiple'+ case 'warehouseSetting':+ return 'warehouse'+ case 'warehouseProcessing':+ return 'vector-combine'+ case 'warehouseMove':+ return 'file-document-arrow-right-outline'+ case 'warehouseFreeze':+ return 'lock-outline'+ case 'warehouseAdjust':+ return 'image-auto-adjust'+ case 'warehouseTaking':+ return 'ballot-recount-outline'+ case 'customer':+ return 'account-box-outline'+ case 'supplier':+ return 'account-badge'+ default:+ return ''+ }+}diff --git a/frontend/src/view/Home/home.vue b/frontend/src/view/Home/home.vueindex 56425a9..7a11ce2 100644--- a/frontend/src/view/Home/home.vue+++ b/frontend/src/view/Home/home.vue@@ -1,32 +1,47 @@<template>- <div class="container">- welcome Home!- <RouterView v-slot="{ Component }">- <keep-alive :include="openedMenus">- <component :is="Component"></component>- </keep-alive>- </RouterView>+ <div class="HomeContainer">+ <HomeSideBar />+ <div class="homeRight">+ <HomeHeader />+ <div class="homeRouterContainer pt-2">+ <RouterView v-slot="{ Component }">+ <keep-alive :include="openedMenus">+ <component :is="Component"></component>+ </keep-alive>+ </RouterView>+ </div>+ </div></div></template><script lang="ts" setup>-import { computed, reactive } from 'vue'-import { router } from '@/router/index'+import { computed } from 'vue'import { store } from '@/store'--const method = reactive({- // Open menu- openMenu: (menuName: string) => {- if (menuName === 'login') {- store.commit('system/clearOpenedMenu', menuName)- } else {- store.commit('system/addOpenedMenu', menuName)- }- router.push(menuName)- }-})+import HomeHeader from './homeHeader.vue'+import HomeSideBar from './homeSideBar.vue'const openedMenus = computed(() => store.getters['system/openedMenus'])</script>-<style scoped lang="less"></style>+<style scoped lang="less">+@headerHeight: 60px;+@sideBarWidth: 300px;+@sideBarTitleHeight: 80px;++.HomeContainer {+ width: 100vw;+ height: 100vh;+ display: flex;+ flex-wrap: wrap;++ .homeRight {+ width: calc(100% - @sideBarWidth);+ padding: 0 5%;++ .homeRouterContainer {+ height: calc(100% - @headerHeight);+ box-sizing: border-box;+ }+ }+}+</style>diff --git a/frontend/src/view/Home/homeHeader.vue b/frontend/src/view/Home/homeHeader.vuenew file mode 100644index 0000000..fc05968--- /dev/null+++ b/frontend/src/view/Home/homeHeader.vue@@ -0,0 +1,224 @@+<template>+ <div class="homeHeader">+ <div class="menuTitle">+ <v-breadcrumbs :items="data.breadcrumbItems">+ <template #prepend>+ <v-icon :color="lightGrey" size="small" icon="mdi-form-select"></v-icon>+ </template>+ </v-breadcrumbs>+ </div>+ <div class="toolsBar">+ <div class="gitSrc mr-4">+ <img src="@/assets/img/gitee.png" alt="Gitee" @click="method.toGit('gitee')">+ </div>+ <div class="gitSrc mr-4">+ <img src="@/assets/img/github.png" alt="Gitee" @click="method.toGit('github')">+ </div>+ <LanguagesSwitch />+ <v-menu>+ <template #activator="{ props }">+ <div class="toolItems headPortrait ml-4" v-bind="props">+ <p class="firstName">{{ firstName }}</p>+ <div class="alive"></div>+ </div>+ </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>+ </v-list>+ </v-menu>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive, watch, computed } from 'vue'+import { useRouter } from 'vue-router'+import LanguagesSwitch from '@/components/system/languages.vue'+import { lightGrey } from '@/constant/style'+import i18n from '@/languages/i18n'+import { router } from '@/router'+import { store } from '@/store'+import { DataProps } from '@/types/Home/HomeHeader'++const routerInfo = useRouter()++const data: DataProps = reactive({+ breadcrumbItems: [],+ // User Action List+ userOperationMenu: [+ {+ title: i18n.global.t('system.homeHeader.logout'),+ value: 'logout'+ }+ ]+})++// Get current page route info+watch(+ () => routerInfo,+ (newValue) => {+ const MODULE = i18n.global.t(`router.sideBar.${ newValue.currentRoute.value.meta.menuModule }`)+ const PATH = i18n.global.t(`router.sideBar.${ newValue.currentRoute.value.meta.menuPath }`)++ data.breadcrumbItems = [+ {+ title: PATH,+ disabled: true+ }+ ]++ if (newValue.currentRoute.value.meta.menuModule) {+ data.breadcrumbItems.unshift({+ title: MODULE,+ disabled: true+ })+ }+ },+ { immediate: true, deep: true }+)++const method = reactive({+ // User operation method+ operation: (value: string) => {+ if (value === 'logout') {+ store.commit('system/clearOpenedMenu')+ store.commit('system/setCurrentRouterPath', '')++ router.push('/login')+ }+ },+ toGit: (type: string) => {+ if (type === 'gitee') {+ window.open('https://gitee.com/modernwms/ModernWMS', '_blank')+ } else if (type === 'github') {+ window.open('https://github.com/fjykTec/ModernWMS', '_blank')+ }+ }+})++const firstName = computed(() => {+ const userInfo = store.getters['user/userInfo']+ return userInfo?.user_name?.charAt(0) || ''+})+</script>++<style scoped lang="less">+@headerHeight: 60px;++.homeHeader {+ width: 100%;+ height: @headerHeight;+ position: relative;+ display: flex;+ justify-content: space-between;+ align-items: center;+ padding: 0 20px;+ box-sizing: border-box;+ border-radius: 0 0 10px 10px;+ transition: all 0.5s;++ box-shadow: 0 3px 3px -2px var(--v-shadow-key-umbra-opacity, rgba(0, 0, 0, 0.2)),+ 0 3px 4px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.14)), 0 1px 8px 0 var(--v-shadow-key-penumbra-opacity, rgba(0, 0, 0, 0.12));+ background-color: rgba(255, 255, 255, 0.5);++ .menuTitle {+ display: flex;++ .v-icon {+ margin-right: 10px;+ }++ span {+ color: #b9b8bc;+ }+ }++ .gitSrc {+ display: flex;+ align-items: center;+ justify-content: flex-end;++ > img {+ width: 24px;+ height: 24px;+ opacity: 0.5;+ }++ :hover {+ cursor: pointer;+ opacity: 1;+ scale: 1.1;+ transition: all ease-in-out 0.2s;+ }+ }+ .toolsBar {+ display: flex;+ align-items: center;+ justify-content: flex-end;++ .toolItems {+ height: 40px;+ width: 40px;+ font-size: 16px;+ display: flex;+ justify-content: center;+ align-items: center;+ transition: all 0.5s;+ border-radius: 40px;+ margin-right: 10px;+ cursor: pointer;++ &:hover {+ background-color: #e4e5ea;+ }++ &:active {+ background-color: #cdced3;+ }+ }++ .bell {+ position: relative;++ .hasNotify {+ margin: 0;+ width: 11px;+ height: 11px;+ border-radius: 11px;+ background-color: #ff4c51;+ border: 1px solid #fff;+ position: absolute;+ top: 5px;+ right: 7px;+ }+ }++ .headPortrait {+ border-radius: 40px;+ width: 40px;+ height: 40px;+ background-color: #e8e2fb;+ position: relative;++ .alive {+ margin: 0;+ width: 11px;+ height: 11px;+ border-radius: 11px;+ background-color: #56ca00;+ border: 1px solid #fff;+ position: absolute;+ bottom: 1px;+ right: 1px;+ }+ }+ }+}++.firstName{+ font-weight: 600;+ color: #9c27b0;+}+</style>diff --git a/frontend/src/view/Home/homeSideBar.vue b/frontend/src/view/Home/homeSideBar.vuenew file mode 100644index 0000000..71d59ff--- /dev/null+++ b/frontend/src/view/Home/homeSideBar.vue@@ -0,0 +1,180 @@+<template>+ <div style="height: 100%">+ <div class="homeSidebar">+ <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)">+ <div style="display: flex; align-items: center; height: 100%">+ <div class="menuIcon">+ <v-icon+ :icon="item.icon ? 'mdi-' + item.icon : 'mdi-checkbox-blank-circle-outline'"+ :size="18"+ :color="currentRouterPath === item.routerPath ? '#fff' : '#524e59'"+ ></v-icon>+ </div>+ <div class="menuLabel">{{ item.lable }}</div>+ </div>+ <div v-if="item.children && item.children.length > 0" :class="item.showDetail && 'rotate90'">+ <v-icon icon="mdi-chevron-right" color="#524e59" :size="22"></v-icon>+ </div>+ </div>+ <!-- <Transition name="menu"> -->+ <v-expand-transition>+ <div v-show="item.showDetail">+ <div+ v-for="(detailItem, detailIndex) in item.children"+ :key="detailIndex"+ class="menuItems padding-l"+ :class="method.getItemClass(detailItem)"+ @click="method.openMenu(detailItem)"+ >+ <div style="display: flex; align-items: center; height: 100%">+ <div class="menuIcon">+ <v-icon+ :icon="detailItem.icon ? `mdi-${detailItem.icon}` : 'mdi-checkbox-blank-circle-outline'"+ :size="14"+ :color="currentRouterPath === detailItem.routerPath ? '#fff' : '#524e59'"+ ></v-icon>+ </div>+ <div class="menuLabel">{{ detailItem.lable }}</div>+ </div>+ </div>+ </div>+ </v-expand-transition>+ <!-- </Transition> -->+ </div>+ </div>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { reactive, onMounted, computed } from 'vue'+import Logo from '@/components/system/logo.vue'+import { SideBarMenu, SideBarDataProps } from '@/types/Home/Home'+import { menusToSideBar } from '@/utils/router'+import { store } from '@/store'+import { router } from '@/router'++const data: SideBarDataProps = reactive({+ menuList: []+})++const method = reactive({+ // Open menu+ openMenu: (item: SideBarMenu) => {+ if (item.children && item.children.length > 0) {+ item.showDetail = !item.showDetail+ } else if (item.routerPath && currentRouterPath.value !== item.routerPath) {+ // If the selected menu is skipped, no action will be taken+ store.commit('system/setCurrentRouterPath', item.routerPath)+ store.commit('system/addOpenedMenu', item.routerPath)+ router.push(item.routerPath)+ }+ // if (menuName === 'login') {+ // store.commit('system/clearOpenedMenu', menuName)+ // } else {+ // store.commit('system/addOpenedMenu', menuName)+ // }+ // router.push(menuName)+ },+ // Get item class+ getItemClass: (item: SideBarMenu) => {+ if (item.children && item.children.length > 0 && item.showDetail) {+ return 'openedMenuItems'+ }+ if (currentRouterPath.value === item.routerPath) {+ return 'activeMenuItems'+ }+ return ''+ }+})++// Currently selected menu+const currentRouterPath = computed(() => store.getters['system/currentRouterPath'])++onMounted(() => {+ data.menuList = menusToSideBar()+})+</script>++<style scoped lang="less">+@headerHeight: 60px;+@sideBarWidth: 300px;+@sideBarTitleHeight: 70px;+.homeSidebar {+ width: @sideBarWidth;+ box-shadow: 5px 5px 5px #dbdce2;+ height: 100%;+ .sideBarTitle {+ height: @sideBarTitleHeight;+ position: relative;+ }+ .sideBarMenus {+ height: calc(100% - @sideBarTitleHeight);+ overflow: auto;+ .menuItems {+ // height: 42px;+ width: calc(100% - 20px);+ box-sizing: border-box;+ padding: 10px 0;+ padding-left: 22px;+ padding-right: 8px;+ border-radius: 0 50px 50px 0;+ margin-bottom: 7px;+ display: flex;+ justify-content: space-between;+ align-items: center;+ color: #696671;+ cursor: pointer;+ .menuIcon {+ height: 100%;+ width: 20px;+ margin-right: 10px;+ display: flex;+ justify-content: center;+ align-items: center;+ .v-icon {+ width: 10px;+ height: 10px;+ }+ }+ &:hover {+ background-color: #edeef3;+ }+ }++ .openedMenuItems {+ background-color: #e8e9ed;+ }+ .activeMenuItems {+ background: linear-gradient(to right, #af85fc, #9155fd);+ color: #fff;+ &:hover {+ background: linear-gradient(to right, #af85fc, #9155fd);+ }+ }++ &::-webkit-scrollbar {+ width: 7px;+ }++ &::-webkit-scrollbar-thumb {+ border-radius: 20px;+ background-color: #e5e5e9;+ }+ }+}++.rotate90 {+ transform: rotate(90deg);+}++.padding-l{+ padding-left: 44px !important;+}+</style>diff --git a/frontend/src/view/Home/homepage/homepage.vue b/frontend/src/view/Home/homepage/homepage.vuenew file mode 100644index 0000000..46e7f8e--- /dev/null+++ b/frontend/src/view/Home/homepage/homepage.vue@@ -0,0 +1,68 @@+<template>+ <div class="container">+ <div class="textBox">+ <div class="mainTitle">ModernWMS</div>+ <div class="subTitle">{{ i18n.global.t('homepage.subTitle') }}</div>+ </div>+ <div class="content">+ <div class="lottieBox">+ <lottie :src="dataJson"></lottie>+ </div>+ </div>+ </div>+</template>++<script lang="ts" setup>+import lottie from '@/components/lottie.vue'+import dataJson from '@/assets/warehouse.json'+import i18n from '@/languages/i18n'+</script>++<style scoped lang="less">+.container {+ width: 100%;+ height: 100%;+ display: flex;+ justify-content: center;+ position: relative;+ align-items: center;+}++.content {+ width: 60%;+}++.textBox {+ width: 100%;+ position: absolute;+ left: 50%;+ top: 5%;+ transform: translate(-50%, 0);+ letter-spacing: 5px;+ z-index: 999;+ font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;+}++.mainTitle {+ display: flex;+ justify-content: center;+ width: 100%;+ color: #9c27b0;+ font-weight: bold;+ font-size: 120px;+}++.subTitle {+ display: flex;+ justify-content: center;+ width: 100%;+ font-size: 30px;+ letter-spacing: 5px;+ color: #c9a7cf;+}++.lottieBox {+ min-width: 100%;+ max-width: 100%;+}+</style>diff --git a/frontend/src/view/Login/login.vue b/frontend/src/view/Login/login.vueindex 9df9b53..d68cf91 100644--- a/frontend/src/view/Login/login.vue+++ b/frontend/src/view/Login/login.vue@@ -1,8 +1,8 @@<template>- <div class="container">- <img class="SysTitleLogo" src="@/assets/img/WMSTitle.png" />+ <div class="loginContainer">+ <Logo /><div class="loginLeft">- <img src="../../assets/img/loginLeft3.png" />+ <img src="../../assets/img/loginLeft.png" style="width: 80%" /></div><div class="loginRight"><div class="LanguagesSwitchContainer">@@ -14,23 +14,20 @@</template><script lang="ts" setup>-import LoginForm from '@/components/login/loginForm.vue'-import LanguagesSwitch from '@/components/common/languages.vue'+import LoginForm from '@/components/login/login-form.vue'+import LanguagesSwitch from '@/components/system/languages.vue'+import Logo from '@/components/system/logo.vue'</script><style scoped lang="less">-.SysTitleLogo {- position: absolute;- top: 20px;- left: 20px;- height: 80px;-}.LanguagesSwitchContainer {position: absolute;right: 10px;top: 10px;}-.container {+.loginContainer {+ width: 100%;+ height: 100%;display: flex;background-color: #fff;.loginLeft {@@ -41,7 +38,7 @@ import LanguagesSwitch from '@/components/common/languages.vue'}.loginRight {width: 30%;- background-color: #f4f5fa;+ background-color: #fafafa;display: flex;align-items: center;}diff --git a/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue b/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vuenew file mode 100644index 0000000..254f0f1--- /dev/null+++ b/frontend/src/view/base/commodityCategorySetting/add-or-update-category.vue@@ -0,0 +1,143 @@+<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.commodityCategorySetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.category_name"+ :label="$t('base.commodityCategorySetting.category_name')"+ :rules="data.rules.category_name"+ variant="outlined"+ ></v-text-field>+ <v-select+ v-model="data.form.parent_id"+ :items="data.combobox.parent"+ item-title="label"+ item-value="value"+ :rules="data.rules.parent_id"+ :label="$t('base.commodityCategorySetting.parent_name')"+ variant="outlined"+ clearable+ ></v-select>+ </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 { CategoryVO } from '@/types/Base/CommodityCategorySetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addCategory, updateCategory, getCategoryAll } from '@/api/base/commodityCategorySetting'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: CategoryVO+}>()++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<CategoryVO>({+ id: 0,+ category_name: ''+ }),+ rules: {+ category_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityCategorySetting.category_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ parent_id: [],+ is_valid: []+ },+ combobox: ref<{+ parent: {+ label: string+ value: number+ }[]+ }>({+ parent: []+ })+})++const method = reactive({+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.parent = []+ const { data: res } = await getCategoryAll()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.parent.push({+ label: item.category_name,+ value: item.id+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addCategory(data.form) : await updateCategory(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) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vuenew file mode 100644index 0000000..78dfdc1--- /dev/null+++ b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue@@ -0,0 +1,241 @@+<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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ 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" :height="tableHeight" :tree-config="data.tableTreeConfig" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <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 :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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </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, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, CategoryVO } from '@/types/Base/CommodityCategorySetting'+import { getCategoryAll, deleteCategory } from '@/api/base/commodityCategorySetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-category.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ tableData: [],+ tableTreeConfig: {+ transform: true,+ rowField: 'id',+ parentField: 'parent_id'+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ category_name: ''+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getCommodityCategorySetting: async () => {+ const { data: res } = await getCategoryAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ // nextTick(() => {+ // xTable.value.setAllTreeExpand(true)+ // })+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ category_name: ''+ }+ 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.getCommodityCategorySetting()+ },+ editRow(row: CategoryVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ // If there is no parent, the parent will not be brought in_ id+ if (data.dialogForm.parent_id === 0) {+ delete data.dialogForm.parent_id+ }+ data.showDialog = true+ },+ deleteRow(row: CategoryVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteCategory(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.commodityCategorySetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type)+ }+ })+ }+})++onMounted(async () => {+ await method.getCommodityCategorySetting()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</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/commodityManagement/add-or-update-commodity.vue b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vuenew file mode 100644index 0000000..a708f28--- /dev/null+++ b/frontend/src/view/base/commodityManagement/add-or-update-commodity.vue@@ -0,0 +1,631 @@+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.commodityManagement')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col cols="3">+ <div class="mainForm" :style="{ height: mainFormHeight }">+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.spu_code"+ :rules="data.rules.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :rules="data.rules.spu_name"+ :label="$t('base.commodityManagement.spu_name')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-select+ v-model="data.form.category_name"+ :items="data.combobox.category_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.category_name"+ :label="$t('base.commodityManagement.category_name')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ @update:model-value="method.categoryNameChange"+ ></v-select>+ <v-text-field+ v-model="data.form.spu_description"+ :rules="data.rules.spu_description"+ :label="$t('base.commodityManagement.spu_description')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-text-field+ v-model="data.form.bar_code"+ :rules="data.rules.bar_code"+ :label="$t('base.commodityManagement.bar_code')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-select+ v-model="data.form.supplier_name"+ :items="data.combobox.supplier_name"+ :rules="data.rules.supplier_name"+ item-title="label"+ item-value="label"+ :label="$t('base.commodityManagement.supplier_name')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ @update:model-value="method.supplierNameChange"+ ></v-select>+ <v-text-field+ v-model="data.form.brand"+ :rules="data.rules.brand"+ :label="$t('base.commodityManagement.brand')"+ variant="outlined"+ density="compact"+ clearable+ class="mb-4"+ ></v-text-field>+ <v-select+ v-model="data.form.length_unit"+ :items="data.combobox.length_unit"+ item-title="label"+ item-value="value"+ :rules="data.rules.length_unit"+ :label="$t('base.commodityManagement.length_unit')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ ></v-select>+ <v-select+ v-model="data.form.volume_unit"+ :items="data.combobox.volume_unit"+ item-title="label"+ item-value="value"+ :rules="data.rules.volume_unit"+ :label="$t('base.commodityManagement.volume_unit')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ ></v-select>+ <v-select+ v-model="data.form.weight_unit"+ :items="data.combobox.weight_unit"+ item-title="label"+ item-value="value"+ :rules="data.rules.weight_unit"+ :label="$t('base.commodityManagement.weight_unit')"+ variant="outlined"+ density="compact"+ class="mb-4"+ clearable+ ></v-select>+ </v-form>+ </div>+ </v-col>+ <v-col cols="9">+ <div class="dataTable">+ <div class="toolbar">+ <tooltip-btn+ icon="mdi-plus"+ :tooltip-text="$t('system.page.insertOneRow')"+ size="x-small"+ @click="method.insertOneRow"+ ></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.export')"+ size="x-small"+ @click="method.exportTable"+ ></tooltip-btn>+ </div>+ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.form.detailList"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ align="center"+ :edit-rules="data.validRules"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :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="sku_code" :title="$t('base.commodityManagement.sku_code')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.sku_code" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.sku_name" type="text"></vxe-input>+ </template>+ </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="unit" :title="$t('base.commodityManagement.unit')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.unit" 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>+ </template>+ </vxe-column>+ <vxe-column field="lenght" :title="$t('base.commodityManagement.lenght')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.lenght" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="width" :title="$t('base.commodityManagement.width')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.width" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="height" :title="$t('base.commodityManagement.height')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.height" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('base.commodityManagement.volume')"> </vxe-column>+ <vxe-column field="cost" :title="$t('base.commodityManagement.cost')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.cost" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="price" :title="$t('base.commodityManagement.price')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <template #edit="{ row }">+ <vxe-input v-model="row.price" 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-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="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </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.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { CommodityVO, CommodityDetailVO } from '@/types/Base/CommodityManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addSpu, updateSpu } from '@/api/base/commodityManagementSetting'+import { getCategoryAll } from '@/api/base/commodityCategorySetting'+import { getSupplierAll } from '@/api/base/supplier'+import { CategoryVO } from '@/types/Base/CommodityCategorySetting'+import { SupplierVO } from '@/types/Base/Supplier'+import { computedSelectTableSearchHeight, SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { removeArrayNull } from '@/utils/common'+import { StringLength } from '@/utils/dataVerification/formRule'+import { isDecimal } from '@/utils/dataVerification/tableRule'+import { exportData } from '@/utils/exportTable'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+ form: CommodityVO+}>()++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<CommodityVO>({+ id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: []+ }),+ tableData: [],+ rules: {+ spu_code: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ spu_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`,+ (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)],+ 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') }!`+ ],+ length_unit: [+ (val: number) => [0, 1, 2, 3].includes(val) || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.length_unit') }!`+ ],+ volume_unit: [+ (val: number) => [0, 1, 2].includes(val) || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.volume_unit') }!`+ ],+ weight_unit: [+ (val: number) => [0, 1, 2].includes(val) || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.weight_unit') }!`+ ],+ supplier_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.supplier_name') }!`+ ]+ },+ validRules: ref<any>({+ sku_code: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }` },+ {+ type: 'string',+ min: 0,+ max: 32,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 32 }`,+ trigger: 'change'+ }+ ],+ sku_name: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }` },+ {+ type: 'string',+ min: 0,+ max: 200,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 200 }`,+ trigger: 'change'+ }+ ],+ unit: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.unit') }` },+ {+ type: 'string',+ min: 0,+ max: 5,+ message: `${ i18n.global.t('system.checkText.lengthValid') }${ 0 }-${ 5 }`,+ trigger: 'change'+ }+ ],+ weight: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ lenght: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ width: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ height: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ volume: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 8,+ decimalLength: 3,+ trigger: 'change'+ }+ ],+ cost: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 10,+ decimalLength: 2,+ trigger: 'change'+ }+ ],+ price: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 10,+ decimalLength: 2,+ trigger: 'change'+ }+ ]+ }),+ combobox: ref<{+ length_unit: {+ label: string+ value: number+ }[]+ volume_unit: {+ label: string+ value: number+ }[]+ weight_unit: {+ label: string+ value: number+ }[]+ category_name: {+ label: string+ value: number+ }[]+ supplier_name: {+ label: string+ value: number+ }[]+ }>({+ length_unit: [+ {+ label: 'mm',+ value: 0+ },+ {+ label: 'cm',+ value: 1+ },+ {+ label: 'dm',+ value: 2+ },+ {+ label: 'm',+ value: 3+ }+ ],+ volume_unit: [+ {+ label: 'cm³',+ value: 0+ },+ {+ label: 'dm³',+ value: 1+ },+ {+ label: 'm³',+ value: 2+ }+ ],+ weight_unit: [+ {+ label: 'mg',+ value: 0+ },+ {+ label: 'g',+ value: 1+ },+ {+ label: 'kg',+ value: 2+ }+ ],+ category_name: [],+ supplier_name: []+ })+})++const method = reactive({+ // When the commodity type changes, it is mainly used to assign the ID+ categoryNameChange: (val: string) => {+ if (!val) {+ data.form.category_id = 0+ } else {+ data.form.category_id = data.combobox.category_name.filter((item) => item.label === val)[0].value+ }+ },+ supplierNameChange: (val: string) => {+ if (!val) {+ data.form.supplier_id = 0+ } else {+ data.form.supplier_id = data.combobox.supplier_name.filter((item) => item.label === val)[0].value+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.category_name = []+ data.combobox.supplier_name = []+ const { data: res } = await getCategoryAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.combobox.category_name = res.data+ .filter((item: CategoryVO) => item.is_valid)+ .map((item: CategoryVO) => ({ value: item.id, label: item.category_name }))+ // Get supplier information+ const { data: supplierRes } = await getSupplierAll()+ if (!supplierRes.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: supplierRes.errorMessage+ })+ return+ }+ data.combobox.supplier_name = supplierRes.data+ .filter((item: SupplierVO) => item.is_valid)+ .map((item: SupplierVO) => ({ value: item.id, label: item.supplier_name }))+ },+ closeDialog: () => {+ emit('close')+ },+ insertOneRow: () => {+ xTable.value.insertAt(-1)+ },+ // Export table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.commodityManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ submit: async () => {+ const $table = xTable.value+ const errMap = await $table.validate(true)+ const { valid } = await formRef.value.validate()+ if (valid && !errMap) {+ if ($table.getTableData().fullData.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ return+ }+ const form = { ...data.form }+ const insertRecords = $table.getInsertRecords()+ form.detailList = []+ // Processing detailed data+ if (dialogTitle.value === 'add') {+ form.detailList = [...insertRecords]+ } else {+ const updateRecords = $table.getUpdateRecords()+ const removeRecords = $table.getRemoveRecords()+ form.detailList = [...insertRecords, ...updateRecords]+ for (const item of removeRecords) {+ item.id = item.id > 0 ? 0 - item.id : item.id+ form.detailList.push(item)+ }+ }+ form.detailList = removeArrayNull(form.detailList)+ const { data: res } = dialogTitle.value === 'add' ? await addSpu(form) : await updateSpu(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')+ })+ }+ },+ editRow: (row: CommodityDetailVO) => {+ const $table = xTable.value+ $table.setEditRow(row)+ },+ deleteRow: (row: CommodityDetailVO) => {+ const $table = xTable.value+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ $table.remove(row)+ }+ })+ }+})++const mainFormHeight = computed(() => computedSelectTableSearchHeight({ hasPager: false, hasToolBar: true }))++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.mainForm {+ background-color: #f9f9f9;+ border-radius: 5px;+ padding: 20px;+ box-sizing: border-box;+ overflow: auto;+}++.toolbar {+ height: 40px;+}+</style>diff --git a/frontend/src/view/base/commodityManagement/commodityManagement.vue b/frontend/src/view/base/commodityManagement/commodityManagement.vuenew file mode 100644index 0000000..c74f284--- /dev/null+++ b/frontend/src/view/base/commodityManagement/commodityManagement.vue@@ -0,0 +1,386 @@+<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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.spu_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.commodityManagement.spu_code')"+ variant="solo"+ >+ </v-text-field>+ </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('base.commodityManagement.spu_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.category_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.commodityManagement.category_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"+ :tree-config="data.tableTreeConfig"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="spu_code" width="150px" :title="$t('base.commodityManagement.spu_code')" tree-node>+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.sku_code }}</span>+ <span v-else>{{ row.spu_code }}</span>+ </template>+ </vxe-column>+ <vxe-column field="spu_name" :title="$t('base.commodityManagement.spu_name')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.sku_name }}</span>+ <span v-else>{{ row.spu_name }}</span>+ </template>+ </vxe-column>+ <vxe-column field="category_name" :title="$t('base.commodityManagement.category_name')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.unit }}</span>+ <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="supplier_name" :title="$t('base.commodityManagement.supplier_name')"> </vxe-column>+ <vxe-column field="brand" :title="$t('base.commodityManagement.brand')"> </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>+ </template>+ </vxe-column>+ <vxe-column field="lenght" :title="$t('base.commodityManagement.lenght')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.lenght} ${GetUnit('length', row.length_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="width" :title="$t('base.commodityManagement.width')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.width} ${GetUnit('length', row.length_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="height" :title="$t('base.commodityManagement.height')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.height} ${GetUnit('length', row.length_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('base.commodityManagement.volume')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>++ <vxe-column field="cost" :title="$t('base.commodityManagement.cost')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.cost }}</span>+ </template>+ </vxe-column>+ <vxe-column field="price" :title="$t('base.commodityManagement.price')">+ <template #default="{ row }">+ <span v-if="row.parent_id > 0">{{ row.price }}</span>+ </template>+ </vxe-column>+ <!-- <vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')"></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="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>+ <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')"+ @click="method.editRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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, reactive, onMounted, 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 { 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 { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data: DataProps = reactive({+ searchForm: {+ spu_code: '',+ spu_name: '',+ category_name: ''+ },+ timer: null,+ tableData: [],+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ tableTreeConfig: {+ transform: true,+ rowField: 'tree_id',+ parentField: 'parent_id'+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: []+ }+})++const method = reactive({+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getCompanyList()+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ const { data: res } = await getSpuList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = []+ for (const item of res.data.rows) {+ item.tree_id = item.id+ data.tableData.push(item)+ for (const ditem of item.detailList) {+ ditem.tree_id = 0+ ditem.parent_id = item.id+ ditem.length_unit = item.length_unit+ ditem.volume_unit = item.volume_unit+ ditem.weight_unit = item.weight_unit+ data.tableData.push(ditem)+ }+ }+ data.tablePage.total = res.data.totals+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ spu_code: '',+ spu_name: '',+ spu_description: '',+ bar_code: '',+ brand: '',+ length_unit: 1,+ volume_unit: 0,+ weight_unit: 1,+ detailList: []+ }+ 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: CommodityVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: CommodityVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteSpu(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.commodityManagement'),+ 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()+})++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/companySetting/add-or-update-company.vue b/frontend/src/view/base/companySetting/add-or-update-company.vuenew file mode 100644index 0000000..80fc453--- /dev/null+++ b/frontend/src/view/base/companySetting/add-or-update-company.vue@@ -0,0 +1,135 @@+<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.companySetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.company_name"+ :label="$t('base.companySetting.company_name')"+ :rules="data.rules.company_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.companySetting.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.companySetting.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.companySetting.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.companySetting.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></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 { CompanyVO } from '@/types/Base/CompanySetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addCompany, updateCompany } from '@/api/base/companySetting'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: CompanyVO+}>()++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<CompanyVO>({+ id: 0,+ company_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }),+ rules: {+ company_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.companySetting.company_name') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ city: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ address: [(val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)],+ manager: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ contact_tel: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addCompany(data.form) : await updateCompany(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/base/companySetting/companySetting.vue b/frontend/src/view/base/companySetting/companySetting.vuenew file mode 100644index 0000000..d6a9884--- /dev/null+++ b/frontend/src/view/base/companySetting/companySetting.vue@@ -0,0 +1,239 @@+<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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ 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" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="company_name" :title="$t('base.companySetting.company_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.companySetting.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.companySetting.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.companySetting.manager')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.companySetting.contact_tel')"></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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </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, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { CompanyVO, DataProps } from '@/types/Base/CompanySetting'+import { getCompanyAll, deleteCompany } from '@/api/base/companySetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-company.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ tableData: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ company_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ const { data: res } = await getCompanyAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ company_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }+ 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: CompanyVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: CompanyVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteCompany(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.companySetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(async () => {+ await method.getCompanyList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</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/customer/add-or-update-customer.vue b/frontend/src/view/base/customer/add-or-update-customer.vuenew file mode 100644index 0000000..16c0606--- /dev/null+++ b/frontend/src/view/base/customer/add-or-update-customer.vue@@ -0,0 +1,141 @@+<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.customer')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.customer_name"+ :label="$t('base.customer.customer_name')"+ :rules="data.rules.customer_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.customer.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.email"+ :label="$t('base.customer.email')"+ :rules="data.rules.email"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.customer.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.customer.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.customer.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></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 { CustomerVO } from '@/types/Base/Customer'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addCustomer, updateCustomer } from '@/api/base/customer'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: CustomerVO+}>()++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<CustomerVO>({+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ }),+ rules: {+ customer_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.customer.customer_name') }!`],+ city: [],+ address: [],+ manager: [],+ email: [],+ contact_tel: [],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addCustomer(data.form) : await updateCustomer(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/base/customer/customer.vue b/frontend/src/view/base/customer/customer.vuenew file mode 100644index 0000000..a700b1e--- /dev/null+++ b/frontend/src/view/base/customer/customer.vue@@ -0,0 +1,297 @@+<!-- customer 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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.customer.customer_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" :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="customer_name" :title="$t('base.customer.customer_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.customer.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.customer.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.customer.manager')"></vxe-column>+ <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>+ <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>+ <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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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" />+ <importCustomerTable :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+</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 { 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 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'++const xTable = ref()++const data = reactive({+ searchForm: {+ customer_name: ''+ },+ tableData: [],+ // activeTab: null,+ showDialog: false,+ showDialogImport: false,+ dialogForm: {+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ },+ timer: ref<any>(null)+})++const method = reactive({+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialog()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getData()+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ customer_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ 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: CustomerVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: CustomerVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteCustomer(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.customer'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ getData: async () => {+ const { data: res } = await getCustomerList(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(() => {+ 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/base/customer/import-customer-table.vue b/frontend/src/view/base/customer/import-customer-table.vuenew file mode 100644index 0000000..0a3c6b2--- /dev/null+++ b/frontend/src/view/base/customer/import-customer-table.vue@@ -0,0 +1,227 @@+<!-- Customer Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <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-column field="customer_name" :title="$t('base.customer.customer_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.customer.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.customer.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.customer.manager')"></vxe-column>+ <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-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 lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/customer'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { CustomerExcelVO } from '@/types/Base/Customer'+import { exportData } from '@/utils/exportTable'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<CustomerExcelVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({}),+ eMsg: ''+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ if (!res.isSuccess) {+ data.eMsg = ''+ if (res.data.length > 0) {+ for (const item of res.data) {+ if (item.errorMsg) {+ data.eMsg = data.eMsg ? data.eMsg + ',' + item.errorMsg : item.errorMsg+ }+ }+ }+ hookComponent.$message({+ type: 'error',+ content: data.eMsg+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.submit') }${ i18n.global.t('system.tips.success') }`+ })+ emit('saveSuccess')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ customer_name: ws[index][i18n.global.t('base.customer.customer_name')] ? ws[index][i18n.global.t('base.customer.customer_name')] + '' : '',+ city: ws[index][i18n.global.t('base.customer.city')] ? ws[index][i18n.global.t('base.customer.city')] + '' : '',+ address: ws[index][i18n.global.t('base.customer.address')] ? ws[index][i18n.global.t('base.customer.address')] + '' : '',+ manager: ws[index][i18n.global.t('base.customer.manager')] ? ws[index][i18n.global.t('base.customer.manager')] + '' : '',+ email: ws[index][i18n.global.t('base.customer.email')] ? ws[index][i18n.global.t('base.customer.email')] + '' : '',+ contact_tel: ws[index][i18n.global.t('base.customer.contact_tel')] ? ws[index][i18n.global.t('base.customer.contact_tel')] + '' : '',+ _XID: '',+ errorMsg: ''+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.customer'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: CustomerExcelVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/freightSetting/add-or-update-freight.vue b/frontend/src/view/base/freightSetting/add-or-update-freight.vuenew file mode 100644index 0000000..c4bbe1c--- /dev/null+++ b/frontend/src/view/base/freightSetting/add-or-update-freight.vue@@ -0,0 +1,175 @@+<!-- Freight Setting Operate Dialog -->+<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.freightSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.carrier"+ :label="$t('base.freightSetting.carrier')"+ :rules="data.rules.carrier"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.departure_city"+ :label="$t('base.freightSetting.departure_city')"+ :rules="data.rules.departure_city"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.arrival_city"+ :label="$t('base.freightSetting.arrival_city')"+ :rules="data.rules.arrival_city"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.price_per_weight"+ :label="$t('base.freightSetting.price_per_weight')"+ :rules="data.rules.price_per_weight"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.price_per_volume"+ :label="$t('base.freightSetting.price_per_volume')"+ :rules="data.rules.price_per_volume"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.min_payment"+ :label="$t('base.freightSetting.min_payment')"+ :rules="data.rules.min_payment"+ variant="outlined"+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.freightSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </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 i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addFreight, updateFreight } from '@/api/base/freightSetting'+import { FreightVO } from '@/types/Base/Freight'+import { StringLength, IsDecimal } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: FreightVO+}>()++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<FreightVO>({+ id: 0,+ carrier: '',+ departure_city: '',+ arrival_city: '',+ price_per_weight: 0,+ price_per_volume: 0,+ min_payment: 0,+ is_valid: true+ }),+ rules: {+ carrier: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.carrier') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ departure_city: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.departure_city') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ arrival_city: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.arrival_city') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ price_per_weight: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.price_per_weight') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 6, 2) === '' || IsDecimal(val, 'nonNegative', 6, 2)+ ],+ price_per_volume: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.price_per_volume') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 6, 2) === '' || IsDecimal(val, 'nonNegative', 6, 2)+ ],+ min_payment: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.freightSetting.min_payment') }!`,+ (val: number) => IsDecimal(val, 'nonNegative', 8, 2) === '' || IsDecimal(val, 'nonNegative', 8, 2)+ ],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addFreight(data.form) : await updateFreight(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) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/freightSetting/freightSetting.vue b/frontend/src/view/base/freightSetting/freightSetting.vuenew file mode 100644index 0000000..8ab3a00--- /dev/null+++ b/frontend/src/view/base/freightSetting/freightSetting.vue@@ -0,0 +1,321 @@+<!-- Freight 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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.carrier"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.freightSetting.carrier')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.departure_city"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.freightSetting.departure_city')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.arrival_city"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.freightSetting.arrival_city')"+ 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: '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="carrier" :title="$t('base.freightSetting.carrier')"></vxe-column>+ <vxe-column field="departure_city" :title="$t('base.freightSetting.departure_city')"></vxe-column>+ <vxe-column field="arrival_city" :title="$t('base.freightSetting.arrival_city')"></vxe-column>+ <vxe-column field="price_per_weight" :title="$t('base.freightSetting.price_per_weight')"></vxe-column>+ <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="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>+ </template>+ </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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onMounted, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { FreightVO } from '@/types/Base/Freight'+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 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'++const xTable = ref()++const data = reactive({+ showDialog: false,+ showDialogImport: false,++ dialogForm: {+ id: 0,+ carrier: '',+ departure_city: '',+ arrival_city: '',+ price_per_weight: 0,+ price_per_volume: 0,+ min_payment: 0,+ is_valid: true+ },+ searchForm: {+ carrier: '',+ departure_city: '',+ arrival_city: ''+ },+ activeTab: null,+ tableData: ref<FreightVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ carrier: '',+ departure_city: '',+ arrival_city: '',+ price_per_weight: 0,+ price_per_volume: 0,+ min_payment: 0,+ 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()+ },+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ // Refresh data+ refresh: () => {+ method.getFreightList()+ },+ getFreightList: async () => {+ const { data: res } = await getFreightList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ editRow(row: FreightVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: FreightVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteFreight(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.getFreightList()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.freightSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ importTable: () => {+ const $table = xTable.value+ $table.importData()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getFreightList()+ }+})++onMounted(() => {+ method.getFreightList()+})++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/freightSetting/import-table.vue b/frontend/src/view/base/freightSetting/import-table.vuenew file mode 100644index 0000000..60c63f9--- /dev/null+++ b/frontend/src/view/base/freightSetting/import-table.vue@@ -0,0 +1,214 @@+<!-- Freight Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <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-column field="carrier" :title="$t('base.freightSetting.carrier')"></vxe-column>+ <vxe-column field="departure_city" :title="$t('base.freightSetting.departure_city')"></vxe-column>+ <vxe-column field="arrival_city" :title="$t('base.freightSetting.arrival_city')"></vxe-column>+ <vxe-column field="price_per_weight" :title="$t('base.freightSetting.price_per_weight')"></vxe-column>+ <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-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 lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/freightSetting'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { FreightVO } from '@/types/Base/Freight'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<FreightVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ 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')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ carrier: formatString(ws[index][i18n.global.t('base.freightSetting.carrier')]),+ departure_city: formatString(ws[index][i18n.global.t('base.freightSetting.departure_city')]),+ arrival_city: formatString(ws[index][i18n.global.t('base.freightSetting.arrival_city')]),+ price_per_weight: ws[index][i18n.global.t('base.freightSetting.price_per_weight')],+ price_per_volume: ws[index][i18n.global.t('base.freightSetting.price_per_volume')],+ min_payment: ws[index][i18n.global.t('base.freightSetting.min_payment')]+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.freightSetting'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: FreightVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue b/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vuenew file mode 100644index 0000000..bd05ba5--- /dev/null+++ b/frontend/src/view/base/ownerOfCargo/add-or-update-owner-of-cargo.vue@@ -0,0 +1,135 @@+<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.ownerOfCargo')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.goods_owner_name"+ :label="$t('base.ownerOfCargo.goods_owner_name')"+ :rules="data.rules.goods_owner_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.ownerOfCargo.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.ownerOfCargo.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.ownerOfCargo.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.ownerOfCargo.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></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 { OwnerOfCargoVO } from '@/types/Base/OwnerOfCargo'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addOwnerOfCargo, updateOwnerOfCargo } from '@/api/base/ownerOfCargo'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: OwnerOfCargoVO+}>()++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<OwnerOfCargoVO>({+ id: 0,+ goods_owner_name: '',+ city: '',+ address: '',+ manager: '',+ contact_tel: ''+ }),+ rules: {+ goods_owner_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.ownerOfCargo.goods_owner_name') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ city: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ address: [(val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)],+ manager: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ contact_tel: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addOwnerOfCargo(data.form) : await updateOwnerOfCargo(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/base/ownerOfCargo/import-table.vue b/frontend/src/view/base/ownerOfCargo/import-table.vuenew file mode 100644index 0000000..23d3a35--- /dev/null+++ b/frontend/src/view/base/ownerOfCargo/import-table.vue@@ -0,0 +1,215 @@+<!-- OwnerOfCargo Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <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-column field="goods_owner_name" :title="$t('base.ownerOfCargo.goods_owner_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.ownerOfCargo.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.ownerOfCargo.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.ownerOfCargo.manager')"></vxe-column>+ <vxe-column field="contact_tel" :title="$t('base.ownerOfCargo.contact_tel')"></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 lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/ownerOfCargo'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { ImportVO } from '@/types/Base/OwnerOfCargo'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<ImportVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ 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')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ goods_owner_name: formatString(ws[index][i18n.global.t('base.ownerOfCargo.goods_owner_name')]),+ city: formatString(ws[index][i18n.global.t('base.ownerOfCargo.city')]),+ address: formatString(ws[index][i18n.global.t('base.ownerOfCargo.address')]),+ manager: formatString(ws[index][i18n.global.t('base.ownerOfCargo.manager')]),+ contact_tel: formatString(ws[index][i18n.global.t('base.ownerOfCargo.contact_tel')])+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.ownerOfCargo'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: ImportVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vuenew file mode 100644index 0000000..36ed0f2--- /dev/null+++ b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue@@ -0,0 +1,279 @@+<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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="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.goods_owner_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.ownerOfCargo.goods_owner_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" :height="tableHeight" align="center">+ <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('base.ownerOfCargo.goods_owner_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.ownerOfCargo.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.ownerOfCargo.address')"></vxe-column>+ <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="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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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-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" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, ref, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { OwnerOfCargoVO, DataProps } from '@/types/Base/OwnerOfCargo'+import { getOwnerOfCargoByPage, deleteOwnerOfCargo } from '@/api/base/ownerOfCargo'+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 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'++const xTable = ref()++const data: DataProps = reactive({+ searchForm: {+ goods_owner_name: ''+ },+ showDialogImport: false,+ tableData: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ goods_owner_name: '',+ city: '',+ address: '',+ contact_tel: '',+ manager: ''+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ timer: null+})++const method = reactive({+ // When change paging+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getOwnerOfCargoList()+ },+ // Find Data by Pagination+ getOwnerOfCargoList: async () => {+ const { data: res } = await getOwnerOfCargoByPage(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,+ goods_owner_name: '',+ city: '',+ address: '',+ contact_tel: '',+ manager: ''+ }+ 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.getOwnerOfCargoList()+ },+ editRow(row: OwnerOfCargoVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: OwnerOfCargoVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteOwnerOfCargo(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.ownerOfCargo'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(async () => {+ await method.getOwnerOfCargoList()+})++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/add-or-update-role-menu.vue b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vuenew file mode 100644index 0000000..7d8b649--- /dev/null+++ b/frontend/src/view/base/roleMenu/add-or-update-role-menu.vue@@ -0,0 +1,208 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('router.sideBar.roleMenu')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.userrole_id"+ :items="data.combobox.role_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.role_name"+ :label="$t('base.roleMenu.role_name')"+ variant="outlined"+ clearable+ ></v-select>+ <v-select+ v-model="data.menusSelectedList"+ :items="data.combobox.menu_name"+ item-title="label"+ item-value="value"+ :label="$t('base.roleMenu.menu_name')"+ variant="outlined"+ chips+ multiple+ clearable+ >+ </v-select>+ </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 { RoleMenuVO, RoleMenuDetailVo } 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 { getUserRoleAll } from '@/api/base/userRoleSetting'+import { MenuItem } from '@/types/System/Store'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: RoleMenuVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ dialogTitle: '',+ form: ref<RoleMenuVO>({+ userrole_id: 0,+ role_name: '',+ detailList: []+ }),+ // Multiple drop-down box values, mainly used to temporarily save the selected values+ menusSelectedList: ref<any[]>([]),+ // If it is modified, you need to pass a negative ID to the API to delete the existing details+ removeDetailList: ref<RoleMenuDetailVo[]>([]),+ // Drop down box options+ combobox: ref<{+ role_name: {+ label: string+ value: number+ }[]+ menu_name: {+ label: string+ value: number+ }[]+ }>({+ role_name: [],+ menu_name: []+ }),+ rules: {+ role_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.roleMenu.role_name') }!`],+ menu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.roleMenu.menu_name') }!`]+ }+})++const method = reactive({+ // Get dialog type, add or update+ getDialogType: () => {+ // This is special because this document is not actually a table,+ // but the data associated with another table.+ // so directly use the details to determine whether it is a new document+ if (props.form.detailList.length > 0) {+ data.dialogTitle = 'update'+ } else {+ data.dialogTitle = 'add'+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.role_name = []+ const { data: res } = await getUserRoleAll()+ if (!res.isSuccess) {+ return+ }+ const roleNameList: UserRoleVO[] = res.data+ for (const role of roleNameList) {+ data.combobox.role_name.push({+ label: role.role_name,+ value: role.id+ })+ }+ 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+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ // Details verification before document submission+ beforeSubmit: (): boolean => {+ let flag = true+ // Process the new dropdown options+ for (const item of data.menusSelectedList) {+ if (data.form.detailList.findIndex((dl) => dl.menu_id === item) < 0) {+ data.form.detailList.push({+ id: 0,+ menu_id: item+ })+ }+ }+ if (data.dialogTitle === 'update') {+ for (const item of data.form.detailList) {+ if (!data.menusSelectedList.includes(item.menu_id)) {+ // Delete if ID is negative+ item.id = -item.id+ }+ }+ }+ if (data.form.detailList.length === 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ 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.dialogTitle === 'add'+ ? await addRoleMenu(data.form)+ : await updateRoleMenu({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] }) // Merge the deleted list and the original list+ 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) {+ method.getDialogType()+ method.getCombobox()+ data.form = props.form+ data.menusSelectedList = data.form.detailList.map((item) => item.menu_id)+ }+ }+)+</script>++<style scoped lang="less">+</style>diff --git a/frontend/src/view/base/roleMenu/roleMenu.vue b/frontend/src/view/base/roleMenu/roleMenu.vuenew file mode 100644index 0000000..aa526f8--- /dev/null+++ b/frontend/src/view/base/roleMenu/roleMenu.vue@@ -0,0 +1,321 @@+<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="3" 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> -->+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row> -->+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <v-row :no-gutters="true">+ <v-col :cols="3" class="dataListCol">+ <v-card :height="tableHeight">+ <NavListVue+ :list-data="data.roleList"+ :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">+ <vxe-table ref="xTable" :data="data.activeRoleMenuForm.detailList" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <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-table>+ </v-col>+ </v-row>+ </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, 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 { 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'++const xTable = ref()++const data: DataProps = reactive({+ navListOptions: {+ title: i18n.global.t('base.roleMenu.role_name'),+ labelKey: 'role_name',+ indexKey: 'userrole_id',+ indexValue: ''+ },+ // Activation id+ activeRoleMenuForm: {+ userrole_id: 0,+ role_name: '',+ detailList: []+ },+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ roleList: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ detailList: []+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getCompanyList: async () => {+ // Clear detailed data before refreshing+ method.clearDialogForm()+ const { data: res } = await getRoleMenuAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.roleList = res.data+ if (data.roleList.findIndex((item) => item.userrole_id === data.activeRoleMenuForm.userrole_id) > -1 && data.activeRoleMenuForm.userrole_id) {+ method.getRoleMenus(data.activeRoleMenuForm.userrole_id)+ } else if (data.roleList.length > 0) {+ method.navListClick(data.roleList[0])+ } else {+ data.activeRoleMenuForm = {+ userrole_id: 0,+ role_name: '',+ detailList: []+ }+ }+ },+ // Add user+ add: () => {+ method.clearDialogForm()+ 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()+ },+ editForm() {+ if (!data.activeRoleMenuForm.userrole_id) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.roleMenu.beforeUpdateOrDel')+ })+ return+ }+ data.dialogForm = JSON.parse(JSON.stringify(data.activeRoleMenuForm))+ // Delete rowid of existing data+ for (const item of data.dialogForm.detailList) {+ if (item._X_ROW_KEY) {+ delete item._X_ROW_KEY+ }+ }+ data.showDialog = true+ },+ deleteForm() {+ if (!data.activeRoleMenuForm.userrole_id) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.roleMenu.beforeUpdateOrDel')+ })+ return+ }+ const row = data.activeRoleMenuForm+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.userrole_id) {+ const { data: res } = await deleteRoleMenu(row.userrole_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.roleMenu'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ // Get detailed data+ getRoleMenus: async (userrole_id: number) => {+ const { data: res } = await getRoleMenuById(userrole_id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.activeRoleMenuForm = res.data+ },+ // Refresh dialog data+ clearDialogForm: () => {+ data.dialogForm = {+ detailList: []+ }+ },+ // Click navList+ navListClick: (item: RoleMenuVO) => {+ if (!item.userrole_id) {+ return+ }+ data.navListOptions.indexValue = String(item.userrole_id)+ method.getRoleMenus(item.userrole_id)+ }+})++onMounted(async () => {+ await method.getCompanyList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</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;+}+// Adjust the spacing between lists and tables+.dataListCol {+ box-sizing: border-box;+ padding-right: 10px !important;+}+.roleNameCol {+ width: 100%;+ height: 100%;+ cursor: pointer;+ // &:hover: {+ // background-color: #9156fd;+ // }+}+.roleNameCol:hover {+ background-color: #9156fd;+ color: white;+}+.activeRow {+ background-color: #9156fd;+}+</style>diff --git a/frontend/src/view/base/supplier/add-or-update-supplier.vue b/frontend/src/view/base/supplier/add-or-update-supplier.vuenew file mode 100644index 0000000..da9ad91--- /dev/null+++ b/frontend/src/view/base/supplier/add-or-update-supplier.vue@@ -0,0 +1,136 @@+<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.supplier_name"+ :label="$t('base.supplier.supplier_name')"+ :rules="data.rules.supplier_name"+ variant="outlined"+ ></v-text-field>+ <v-text-field v-model="data.form.city" :label="$t('base.supplier.city')" :rules="data.rules.city" variant="outlined"></v-text-field>+ <v-text-field v-model="data.form.email" :label="$t('base.supplier.email')" :rules="data.rules.email" variant="outlined"></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.supplier.address')"+ :rules="data.rules.address"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.supplier.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.supplier.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></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 { SupplierVO } from '@/types/Base/Supplier'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addSupplier, updateSupplier } from '@/api/base/supplier'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: SupplierVO+}>()++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<SupplierVO>({+ id: 0,+ supplier_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ }),+ rules: {+ supplier_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.supplier.supplier_name') }!`],+ city: [],+ address: [],+ manager: [],+ email: [],+ contact_tel: [],+ is_valid: []+ }+})++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/base/supplier/import-supplier-table.vue b/frontend/src/view/base/supplier/import-supplier-table.vuenew file mode 100644index 0000000..a0853ab--- /dev/null+++ b/frontend/src/view/base/supplier/import-supplier-table.vue@@ -0,0 +1,216 @@+<!-- Supplier Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <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-column field="supplier_name" :title="$t('base.supplier.supplier_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.supplier.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.supplier.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.supplier.manager')"></vxe-column>+ <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-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 lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/supplier'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { SupplierExcelVO } from '@/types/Base/Supplier'+import { exportData } from '@/utils/exportTable'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<SupplierExcelVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ 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')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ 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')] + '' : ''+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.supplier'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: SupplierExcelVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/supplier/supplier.vue b/frontend/src/view/base/supplier/supplier.vuenew file mode 100644index 0000000..6ab00b3--- /dev/null+++ b/frontend/src/view/base/supplier/supplier.vue@@ -0,0 +1,296 @@+<!-- 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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4"></v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.supplier.supplier_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" :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="supplier_name" :title="$t('base.supplier.supplier_name')"></vxe-column>+ <vxe-column field="city" :title="$t('base.supplier.city')"></vxe-column>+ <vxe-column field="address" :title="$t('base.supplier.address')"></vxe-column>+ <vxe-column field="manager" :title="$t('base.supplier.manager')"></vxe-column>+ <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>+ <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>+ <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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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" />+ <importSupplierTable :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+</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, DataProps } 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 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'++const xTable = ref()++const data = reactive({+ searchForm: {+ supplier_name: ''+ },+ tableData: [],+ // activeTab: null,+ showDialog: false,+ showDialogImport: false,+ dialogForm: {+ id: 0,+ supplier_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ is_valid: true+ },+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ },+ timer: ref<any>(null)+})++const method = reactive({+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialog()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getData()+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ supplier_name: '',+ city: '',+ address: '',+ manager: '',+ email: '',+ contact_tel: '',+ 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(() => {+ 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/base/userManagement/add-or-update-user.vue b/frontend/src/view/base/userManagement/add-or-update-user.vuenew file mode 100644index 0000000..5512d02--- /dev/null+++ b/frontend/src/view/base/userManagement/add-or-update-user.vue@@ -0,0 +1,191 @@+<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.userManagement')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.user_num"+ :label="$t('base.userManagement.user_num')"+ :rules="data.rules.user_num"+ variant="outlined"+ ></v-text-field>+ <v-text-field+ v-model="data.form.user_name"+ :label="$t('base.userManagement.user_name')"+ :rules="data.rules.user_name"+ variant="outlined"+ ></v-text-field>+ <v-select+ v-model="data.form.user_role"+ :items="data.combobox.user_role"+ :rules="data.rules.user_role"+ :label="$t('base.userManagement.user_role')"+ variant="outlined"+ clearable+ ></v-select>+ <v-select+ v-model="data.form.sex"+ :items="data.combobox.sex"+ item-title="label"+ item-value="value"+ :rules="data.rules.sex"+ :label="$t('base.userManagement.sex')"+ variant="outlined"+ clearable+ ></v-select>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.userManagement.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.userManagement.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </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 { UserVO } from '@/types/Base/UserManagement'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addUser, updateUser, getSelectItem } from '@/api/base/userManagement'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: UserVO+}>()++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<UserVO>({+ id: 0,+ user_num: '',+ user_name: '',+ contact_tel: '',+ is_valid: true+ }),+ rules: {+ user_num: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_num') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ user_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_name') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ user_role: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.user_role') }!`],+ sex: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userManagement.sex') }!`],+ contact_tel: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 64)],+ is_valid: []+ },+ combobox: ref<{+ sex: {+ label: string+ value: string+ }[]+ user_role: string[]+ }>({+ sex: [],+ user_role: []+ })+})++const method = reactive({+ // Get the options required by the drop-down box+ getCombobox: async () => {+ // Static drop-down box+ const sexOptions = ['male', 'female']+ data.combobox.sex = []+ for (const sex of sexOptions) {+ data.combobox.sex.push({+ label: i18n.global.t(`system.combobox.sex.${ sex }`),+ value: sex+ })+ }+ // Dynamic drop-down box+ data.combobox.user_role = []+ const { data: res } = await getSelectItem()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ switch (item.code) {+ case 'user_role':+ data.combobox.user_role.push(item.name)+ break+ }+ }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addUser(data.form) : await updateUser(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) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/userManagement/import-table.vue b/frontend/src/view/base/userManagement/import-table.vuenew file mode 100644index 0000000..0b46479--- /dev/null+++ b/frontend/src/view/base/userManagement/import-table.vue@@ -0,0 +1,231 @@+<!-- UserManagement Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <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-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="contact_tel" :title="$t('base.userManagement.contact_tel')"></vxe-column>+ <vxe-column field="user_role" :title="$t('base.userManagement.user_role')"></vxe-column>+ <vxe-column field="sex" :title="$t('base.userManagement.sex')"></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 lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/userManagement'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { ImportVO } from '@/types/Base/UserManagement'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<ImportVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = JSON.parse(JSON.stringify($table.getTableData().fullData))+ for (const item of importData) {+ let sex = 'male'+ if (['男', '女', 'Male', 'Female'].includes(item.sex)) {+ switch (item.sex) {+ case '男':+ case 'Male':+ sex = 'male'+ break+ case '女':+ case 'Female':+ sex = 'female'+ break+ }+ }+ item.sex = sex+ }+ const { data: res } = await excelImport(importData)+ 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')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ user_num: formatString(ws[index][i18n.global.t('base.userManagement.user_num')]),+ user_name: formatString(ws[index][i18n.global.t('base.userManagement.user_name')]),+ contact_tel: formatString(ws[index][i18n.global.t('base.userManagement.contact_tel')]),+ user_role: formatString(ws[index][i18n.global.t('base.userManagement.user_role')]),+ sex: formatString(ws[index][i18n.global.t('base.userManagement.sex')]),+ is_valid: true+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.userManagement'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: ImportVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/userManagement/userManagement.vue b/frontend/src/view/base/userManagement/userManagement.vuenew file mode 100644index 0000000..88f1728--- /dev/null+++ b/frontend/src/view/base/userManagement/userManagement.vue@@ -0,0 +1,352 @@+<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="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>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.user_num"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.userManagement.user_num')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.user_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.userManagement.user_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.user_role"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.userManagement.user_role')"+ 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" :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="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-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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <!-- <vxe-grid v-bind="data.gridOptions">+ <template #pager>+ <custom-pagerr+ v-model:current-page="data.tablePage.pageIndex"+ v-model:page-size="data.tablePage.pageSize"+ :layouts="['Sizes', 'PrevJump', 'PrevPage', 'Number', 'NextPage', 'NextJump', 'FullJump', 'Total']"+ :total="data.tablePage.total"+ @page-change="handlePageChange"+ >+ </custom-pagerr>+ </template>+ </vxe-grid> -->+ </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" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+ </div>+</template>++<script lang="ts" setup>+import { computed, reactive, onMounted, 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, UserVO } from '@/types/Base/UserManagement'+import { getUserList, deleteUser, resetPassword } from '@/api/base/userManagement'+import { hookComponent } from '@/components/system'+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 importTable from './import-table.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data: DataProps = reactive({+ showDialogImport: false,+ searchForm: {+ user_num: '',+ user_name: '',+ user_role: ''+ },+ timer: null,+ tableData: [],+ tablePage: {+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ },+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ user_num: '',+ user_name: '',+ contact_tel: '',+ auth_string: '',+ is_valid: true+ }+})++const method = reactive({+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getUserList()+ },+ // Find Data by Pagination+ getUserList: 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+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ user_num: '',+ user_name: '',+ contact_tel: '',+ auth_string: '',+ 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.getUserList()+ },+ editRow(row: UserVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: UserVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteUser(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()+ }+ }+ })+ },+ // When change paging+ 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.userManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ // Reset password+ restPwd: async () => {+ const checkRecord: UserVO[] = xTable.value.getCheckboxRecords(true)+ if (checkRecord.length > 0) {+ hookComponent.$dialog({+ content: i18n.global.t('base.userManagement.beforeResetPwd'),+ handleConfirm: async () => {+ const idList = checkRecord.map((item) => item.id)+ const { data: res } = await resetPassword(idList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$dialog({+ content: `${ i18n.global.t('base.userManagement.afterResetPwd') } ${ res.data }`+ })+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ }+})++onMounted(async () => {+ await method.getUserList()+})++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/userRoleSetting/add-or-update-user-role.vue b/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vuenew file mode 100644index 0000000..3528b71--- /dev/null+++ b/frontend/src/view/base/userRoleSetting/add-or-update-user-role.vue@@ -0,0 +1,116 @@+<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.userRoleSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.role_name"+ :label="$t('base.userRoleSetting.role_name')"+ :rules="data.rules.role_name"+ variant="outlined"+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.userRoleSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </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 { UserRoleVO } from '@/types/Base/UserRoleSetting'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addUserRole, updateUserRole } from '@/api/base/userRoleSetting'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: UserRoleVO+}>()++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<UserRoleVO>({+ id: 0,+ role_name: '',+ is_valid: true+ }),+ rules: {+ role_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.userRoleSetting.role_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addUserRole(data.form) : await updateUserRole(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/base/userRoleSetting/userRoleSetting.vue b/frontend/src/view/base/userRoleSetting/userRoleSetting.vuenew file mode 100644index 0000000..f692adf--- /dev/null+++ b/frontend/src/view/base/userRoleSetting/userRoleSetting.vue@@ -0,0 +1,234 @@+<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="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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="12" sm="9">+ <!-- <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="12" sm="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ 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" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="role_name" :title="$t('base.userRoleSetting.role_name')"></vxe-column>+ <vxe-column field="is_valid" :title="$t('base.userRoleSetting.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-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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ </vxe-table>+ </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, reactive, onMounted, ref } from 'vue'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { DataProps, UserRoleVO } from '@/types/Base/UserRoleSetting'+import { getUserRoleAll, deleteUserRole } from '@/api/base/userRoleSetting'+import { hookComponent } from '@/components/system'+import addOrUpdateDialog from './add-or-update-user-role.vue'+import i18n from '@/languages/i18n'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++const data: DataProps = reactive({+ // searchForm: {+ // userName: '',+ // userName1: '',+ // userName2: ''+ // },+ tableData: [],+ // Dialog info+ showDialog: false,+ dialogForm: {+ id: 0,+ role_name: '',+ is_valid: true+ }+})++const method = reactive({+ sureSearch: () => {+ // console.log(data.searchForm)+ },+ // Find Data by Pagination+ getUserRoleList: async () => {+ const { data: res } = await getUserRoleAll()+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ },+ // Add user+ add: () => {+ data.dialogForm = {+ id: 0,+ role_name: '',+ 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.getUserRoleList()+ },+ editRow(row: UserRoleVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: UserRoleVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteUserRole(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.userRoleSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(async () => {+ await method.getUserRoleList()+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))++const tableHeight = computed(() => computedTableHeight({ hasTab: false, hasPager: false }))+</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/warehouseSetting/add-or-update-location.vue b/frontend/src/view/base/warehouseSetting/add-or-update-location.vuenew file mode 100644index 0000000..bf2ea05--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/add-or-update-location.vue@@ -0,0 +1,361 @@+<!-- Location Setting Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.locationSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.warehouse_id"+ :items="data.combobox.warehouse_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="outlined"+ clearable+ @update:model-value="method.changeWarehouse"+ ></v-select>+ <v-select+ v-model="data.form.warehouse_area_id"+ :items="data.combobox.warehouse_area_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_area_name"+ :label="$t('base.warehouseSetting.area_name')"+ variant="outlined"+ clearable+ @update:model-value="method.changeWarehouseArea"+ ></v-select>+ <v-select+ v-model="data.form.warehouse_area_property"+ :items="data.combobox.area_property"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_area_property"+ :label="$t('base.warehouseSetting.area_property')"+ variant="outlined"+ disabled+ clearable+ ></v-select>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('base.warehouseSetting.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_length"+ :label="$t('base.warehouseSetting.location_length')"+ :rules="data.rules.location_length"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_width"+ :label="$t('base.warehouseSetting.location_width')"+ :rules="data.rules.location_width"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_heigth"+ :label="$t('base.warehouseSetting.location_heigth')"+ :rules="data.rules.location_heigth"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_volume"+ :label="$t('base.warehouseSetting.location_volume')"+ :rules="data.rules.location_volume"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_load"+ :label="$t('base.warehouseSetting.location_load')"+ :rules="data.rules.location_load"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.roadway_number"+ :label="$t('base.warehouseSetting.roadway_number')"+ :rules="data.rules.roadway_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.shelf_number"+ :label="$t('base.warehouseSetting.shelf_number')"+ :rules="data.rules.shelf_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.layer_number"+ :label="$t('base.warehouseSetting.layer_number')"+ :rules="data.rules.layer_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.tag_number"+ :label="$t('base.warehouseSetting.tag_number')"+ :rules="data.rules.tag_number"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.warehouseSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </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 { hookComponent } from '@/components/system/index'+import { addGoodsLocation, updateGoodsLocation, getWarehouseSelect, getWarehouseAreaSelect } from '@/api/base/warehouseSetting'+import { GoodsLocationVO, AreaProperty } from '@/types/Base/Warehouse'+import i18n from '@/languages/i18n'+import { StringLength, IsDecimal } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: GoodsLocationVO+}>()++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<GoodsLocationVO>({+ id: 0,+ warehouse_name: '',+ warehouse_area_name: '',+ location_name: '',+ location_length: 0,+ location_width: 0,+ location_heigth: 0,+ location_volume: 0,+ location_load: 0,+ roadway_number: '',+ shelf_number: '',+ layer_number: '',+ tag_number: '',+ is_valid: true+ }),+ rules: {+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.warehouse_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ warehouse_area_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.area_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ warehouse_area_property: [],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.location_name') }!`,+ (val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)+ ],+ location_length: [(val: number) => IsDecimal(val, 'nonNegative', 5, 2) === '' || IsDecimal(val, 'nonNegative', 5, 2)],+ location_width: [(val: number) => IsDecimal(val, 'nonNegative', 5, 2) === '' || IsDecimal(val, 'nonNegative', 5, 2)],+ location_heigth: [(val: number) => IsDecimal(val, 'nonNegative', 5, 2) === '' || IsDecimal(val, 'nonNegative', 5, 2)],+ location_volume: [(val: number) => IsDecimal(val, 'nonNegative', 12, 2) === '' || IsDecimal(val, 'nonNegative', 12, 2)],+ location_load: [(val: number) => IsDecimal(val, 'nonNegative', 8, 2) === '' || IsDecimal(val, 'nonNegative', 8, 2)],+ roadway_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ shelf_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ layer_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ tag_number: [(val: string) => StringLength(val, 0, 10) === '' || StringLength(val, 0, 10)],+ is_valid: []+ },+ combobox: ref<{+ warehouse_name: {+ label: string+ value: number+ }[]+ warehouse_area_name: {+ label: string+ value: number+ meta: any+ }[]+ area_property: {+ label: string+ value: AreaProperty+ }[]+ }>({+ warehouse_name: [],+ warehouse_area_name: [],+ area_property: [+ {+ label: i18n.global.t('base.warehouseSetting.picking_area'),+ value: AreaProperty.picking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.stocking_area'),+ value: AreaProperty.stocking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.receiving_area'),+ value: AreaProperty.receiving_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.return_area'),+ value: AreaProperty.return_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.defective_area'),+ value: AreaProperty.defective_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.inventory_area'),+ value: AreaProperty.inventory_area+ }+ ]+ })+})++const method = reactive({+ changeWarehouse: (warehouseID: any) => {+ data.combobox.warehouse_area_name = []++ if (!warehouseID) {+ method.initWarehouseArea()+ return+ }++ // Find the ID corresponding value+ const warehouse = data.combobox.warehouse_name.find((item) => item.value === warehouseID)+ if (warehouse) {+ data.form.warehouse_name = warehouse.label+ data.form.warehouse_id = warehouseID++ // Clear messages of warehouse area when warehouse changed.+ method.initWarehouseArea()+ method.getWarehouseAreaSelect(warehouseID)+ }+ },+ changeWarehouseArea: (warehouseAreaID: any) => {+ if (!warehouseAreaID) {+ method.initWarehouseArea()+ return+ }++ // Find the ID corresponding value+ const warehouse = data.combobox.warehouse_area_name.find((item) => item.value === warehouseAreaID)+ if (warehouse) {+ data.form.warehouse_area_name = warehouse.label+ data.form.warehouse_area_id = warehouseAreaID+ data.form.warehouse_area_property = warehouse.meta+ }+ },+ // Clear messages of warehouse area when warehouse changed.+ initWarehouseArea() {+ delete data.form.warehouse_area_id+ data.form.warehouse_area_name = ''+ delete data.form.warehouse_area_property+ },+ getWarehouseSelect: async () => {+ data.combobox.warehouse_name = []+ const { data: res } = await getWarehouseSelect()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.warehouse_name.push({+ label: item.name,+ // WarehouseID is a numberic type+ value: Number(item.value)+ })+ }+ },+ // Get warehouse area select when warehouse changed.+ getWarehouseAreaSelect: async (warehouseID: number) => {+ data.combobox.warehouse_area_name = []+ const { data: res } = await getWarehouseAreaSelect(warehouseID)+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.warehouse_area_name.push({+ label: item.area_name,+ // ID: WarehouseAreaID+ value: item.id,+ // Custom Property+ meta: item.area_property+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addGoodsLocation(data.form) : await updateGoodsLocation(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) {+ method.initForm()+ method.getWarehouseSelect()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue b/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vuenew file mode 100644index 0000000..8635238--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/add-or-update-reservoir.vue@@ -0,0 +1,213 @@+<!-- Reservoir Setting Operate Dialog -->+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('base.warehouseSetting.reservoirSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.warehouse_id"+ :items="data.combobox.warehouse_name"+ item-title="label"+ item-value="value"+ :rules="data.rules.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="outlined"+ clearable+ @update:model-value="method.changeWarehouse"+ ></v-select>+ <v-text-field+ v-model="data.form.area_name"+ :label="$t('base.warehouseSetting.area_name')"+ :rules="data.rules.area_name"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-select+ v-model="data.form.area_property"+ :items="data.combobox.area_property"+ item-title="label"+ item-value="value"+ :rules="data.rules.area_property"+ :label="$t('base.warehouseSetting.area_property')"+ variant="outlined"+ clearable+ ></v-select>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.warehouseSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </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 i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addWarehouseArea, updateWarehouseArea, getWarehouseSelect } from '@/api/base/warehouseSetting'+import { WarehouseAreaVO, AreaProperty } from '@/types/Base/Warehouse'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: WarehouseAreaVO+}>()++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<WarehouseAreaVO>({+ id: 0,+ warehouse_id: 0,+ parent_id: 0,+ warehouse_name: '',+ area_name: '',+ area_property: AreaProperty.picking_area,+ is_valid: true+ }),+ rules: {+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.warehouse_name') }!`+ ],+ area_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.area_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ area_property: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.area_property') }!`+ ],+ is_valid: []+ },+ combobox: ref<{+ warehouse_name: {+ label: string+ value: number+ }[]+ area_property: {+ label: string+ value: AreaProperty+ }[]+ }>({+ warehouse_name: [],+ area_property: [+ {+ label: i18n.global.t('base.warehouseSetting.picking_area'),+ value: AreaProperty.picking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.stocking_area'),+ value: AreaProperty.stocking_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.receiving_area'),+ value: AreaProperty.receiving_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.return_area'),+ value: AreaProperty.return_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.defective_area'),+ value: AreaProperty.defective_area+ },+ {+ label: i18n.global.t('base.warehouseSetting.inventory_area'),+ value: AreaProperty.inventory_area+ }+ ]+ })+})++const method = reactive({+ getCombobox: async () => {+ data.combobox.warehouse_name = []+ const { data: res } = await getWarehouseSelect()+ if (!res.isSuccess) {+ return+ }+ for (const item of res.data) {+ data.combobox.warehouse_name.push({+ label: item.name,+ // WarehouseID is a numberic type+ value: Number(item.value)+ })+ }+ },+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ changeWarehouse: (warehouseID: any) => {+ // Find the ID corresponding value+ const warehouse = data.combobox.warehouse_name.find((item) => item.value === warehouseID)+ if (warehouse) {+ data.form.warehouse_name = warehouse.label+ data.form.warehouse_id = warehouseID+ }+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addWarehouseArea(data.form) : await updateWarehouseArea(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) {+ method.initForm()+ method.getCombobox()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue b/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vuenew file mode 100644index 0000000..fa5c25b--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/add-or-update-warehouse.vue@@ -0,0 +1,172 @@+<!-- Warehouse Setting Operate Dialog -->+<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.warehouseSetting')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.warehouse_name"+ :label="$t('base.warehouseSetting.warehouse_name')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.city"+ :label="$t('base.warehouseSetting.city')"+ :rules="data.rules.city"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.address"+ :label="$t('base.warehouseSetting.address')"+ :rules="data.rules.address"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.contact_tel"+ :label="$t('base.warehouseSetting.contact_tel')"+ :rules="data.rules.contact_tel"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.email"+ :label="$t('base.warehouseSetting.email')"+ :rules="data.rules.email"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.manager"+ :label="$t('base.warehouseSetting.manager')"+ :rules="data.rules.manager"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-switch+ v-model="data.form.is_valid"+ color="primary"+ :label="$t('base.warehouseSetting.is_valid')"+ :rules="data.rules.is_valid"+ ></v-switch>+ </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 i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addWarehouse, updateWarehouse } from '@/api/base/warehouseSetting'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { StringLength } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: WarehouseVO+}>()++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<WarehouseVO>({+ id: 0,+ warehouse_name: '',+ city: '',+ address: '',+ contact_tel: '',+ email: '',+ manager: '',+ is_valid: true+ }),+ rules: {+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.warehouse_name') }!`,+ (val: string) => StringLength(val, 0, 32) === '' || StringLength(val, 0, 32)+ ],+ city: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.city') }!`,+ (val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)+ ],+ address: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.address') }!`,+ (val: string) => StringLength(val, 0, 256) === '' || StringLength(val, 0, 256)+ ],+ contact_tel: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ email: [(val: string) => StringLength(val, 0, 128) === '' || StringLength(val, 0, 128)],+ manager: [(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)],+ is_valid: []+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addWarehouse(data.form) : await updateWarehouse(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) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/import-table.vue b/frontend/src/view/base/warehouseSetting/import-table.vuenew file mode 100644index 0000000..ae67cdc--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/import-table.vue@@ -0,0 +1,214 @@+<!-- Warehouse Setting Import Dialog -->+<template>+ <v-dialog v-model="isShow" width="70%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('system.page.import')}`"></v-toolbar>+ <v-card-text>+ <div class="mb-4">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.chooseFile')" size="x-small" @click="method.chooseFile"></tooltip-btn>+ <tooltip-btn+ icon="mdi-export-variant"+ :tooltip-text="$t('system.page.exportTemplate')"+ size="x-small"+ @click="method.exportTemplate"+ ></tooltip-btn>+ <input v-show="false" id="open" ref="uploadExcel" type="file" accept=".xls, .xlsx" @change="method.readExcel" />+ </div>+ <vxe-table+ ref="xTable"+ :column-config="{ minWidth: '100px' }"+ :data="data.importData"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ :export-config="{}"+ align="center"+ >+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="60" :title="$t('system.page.operate')" :resizable="false">+ <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-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-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 lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import * as XLSX from 'xlsx'+import i18n from '@/languages/i18n'+import { excelImport } from '@/api/base/warehouseSetting'+import { hookComponent } from '@/components/system/index'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { exportData } from '@/utils/exportTable'+import { formatString } from '@/utils/format/formatSystem'++const emit = defineEmits(['close', 'saveSuccess'])+const uploadExcel = ref()+const xTable = ref()++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ importData: ref<Array<WarehouseVO>>([]),+ validRules: ref<VxeTablePropTypes.EditRules>({})+})++const method = reactive({+ initForm: () => {+ data.importData = []+ },+ closeDialog: () => {+ emit('close')+ },+ submit: async () => {+ const isValid = method.valid()+ if (!isValid) {+ return+ }++ const $table = xTable.value+ // It must be use 'getTableData()' to get all datas with table because it will delete row sometimes.+ const importData = $table.getTableData().fullData++ const { data: res } = await excelImport(importData)+ 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')+ },++ valid: () => {+ const $table = xTable.value+ const importData = $table.getTableData().fullData++ if (importData.length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.tips.detailLengthIsZero') }`+ })+ return false+ }+ return true+ },++ chooseFile: async () => {+ uploadExcel.value.value = ''+ uploadExcel.value.click()+ },++ readExcel: async (evnt: any) => {+ const files = evnt.target.files+ if (files.length <= 0) {+ return false+ }++ const file = files[0]+ const fileReader = new FileReader()++ fileReader.onload = (ev: ProgressEvent<FileReader>) => {+ const fileData = ev?.target?.result+ if (fileData) {+ const workbook = XLSX.read(fileData, { type: 'binary' })+ const wsname = workbook.SheetNames[0]++ let ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname])+ let str = JSON.stringify(ws)+ str = str.replace(/(/g, '(')+ str = str.replace(/)/g, ')')+ ws = JSON.parse(str)++ data.importData = []+ ws.forEach((value: any, index: number, ws: any) => {+ data.importData.push({+ warehouse_name: formatString(ws[index][i18n.global.t('base.warehouseSetting.warehouse_name')]),+ city: formatString(ws[index][i18n.global.t('base.warehouseSetting.city')]),+ address: formatString(ws[index][i18n.global.t('base.warehouseSetting.address')]),+ contact_tel: formatString(ws[index][i18n.global.t('base.warehouseSetting.contact_tel')]),+ email: formatString(ws[index][i18n.global.t('base.warehouseSetting.email')]),+ manager: formatString(ws[index][i18n.global.t('base.warehouseSetting.manager')])+ })+ })+ }+ }+ fileReader.readAsBinaryString(file)+ },++ exportTemplate: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseSetting'),+ mode: 'header',+ columnFilterMethod({ column }: any) {+ return !['checkbox', 'seq'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ deleteRow: (row: WarehouseVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTable.value+ $table.remove(row)+ }+ }+ })+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/base/warehouseSetting/tab-location.vue b/frontend/src/view/base/warehouseSetting/tab-location.vuenew file mode 100644index 0000000..6f014fc--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/tab-location.vue@@ -0,0 +1,290 @@+<template>+ <div class="operateArea">+ <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-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>+ </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-text-field+ v-model="data.searchForm.warehouse_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.warehouse_area_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.area_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="xTableGoodsLocation" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <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')">+ <template #default="{ row, column }">+ <span>{{ formatAreaProperty(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column>+ <vxe-column width="150px" field="location_length" :title="$t('base.warehouseSetting.location_length')"></vxe-column>+ <vxe-column width="150px" field="location_width" :title="$t('base.warehouseSetting.location_width')"></vxe-column>+ <vxe-column width="150px" field="location_heigth" :title="$t('base.warehouseSetting.location_heigth')"></vxe-column>+ <vxe-column width="150px" field="location_volume" :title="$t('base.warehouseSetting.location_volume')"></vxe-column>+ <vxe-column width="150px" field="location_load" :title="$t('base.warehouseSetting.location_load')"></vxe-column>+ <vxe-column field="roadway_number" :title="$t('base.warehouseSetting.roadway_number')"></vxe-column>+ <vxe-column field="shelf_number" :title="$t('base.warehouseSetting.shelf_number')"></vxe-column>+ <vxe-column field="layer_number" :title="$t('base.warehouseSetting.layer_number')"></vxe-column>+ <vxe-column field="tag_number" :title="$t('base.warehouseSetting.tag_number')"></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-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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, 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 { 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 { DEBOUNCE_TIME } from '@/constant/system'+import { SearchObject } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'++const xTableGoodsLocation = ref()++const data = reactive({+ showDialog: false,+ dialogForm: ref<GoodsLocationVO>({+ id: 0,+ warehouse_name: '',+ warehouse_area_name: '',+ location_name: '',+ location_length: 0,+ location_width: 0,+ location_heigth: 0,+ location_volume: 0,+ location_load: 0,+ roadway_number: '',+ shelf_number: '',+ layer_number: '',+ tag_number: '',+ is_valid: true+ }),+ searchForm: {+ warehouse_name: '',+ warehouse_area_name: ''+ },+ activeTab: null,+ tableData: ref<GoodsLocationVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ warehouse_name: '',+ warehouse_area_name: '',+ location_name: '',+ location_length: 0,+ location_width: 0,+ location_heigth: 0,+ location_volume: 0,+ location_load: 0,+ roadway_number: '',+ shelf_number: '',+ layer_number: '',+ tag_number: '',+ 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.getGoodsLocationList()+ },+ getGoodsLocationList: async () => {+ const { data: res } = await getGoodsLocationList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ editRow(row: GoodsLocationVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: GoodsLocationVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteGoodsLocation(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.getGoodsLocationList()+ }),+ exportTable: () => {+ const $table = xTableGoodsLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('base.warehouseSetting.locationSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getGoodsLocationList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getGoodsLocationList: method.getGoodsLocationList+})+</script>++<style lang="less" scoped>+.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/warehouseSetting/tab-reservoir.vue b/frontend/src/view/base/warehouseSetting/tab-reservoir.vuenew file mode 100644index 0000000..55d90fe--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/tab-reservoir.vue@@ -0,0 +1,265 @@+<template>+ <div class="operateArea">+ <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-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>+ </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-text-field+ v-model="data.searchForm.warehouse_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.area_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.area_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="xTableWarehouseArea" :data="data.tableData" :height="tableHeight" align="center">+ <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="area_name" :title="$t('base.warehouseSetting.area_name')"></vxe-column>+ <vxe-column field="area_property" :title="$t('base.warehouseSetting.area_property')">+ <template #default="{ row, column }">+ <span>{{ formatAreaProperty(row[column.property]) }}</span>+ </template>+ </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-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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseAreaVO, AreaProperty } from '@/types/Base/Warehouse'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteWarehouseArea, getWarehouseAreaList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+import addOrUpdateDialog from './add-or-update-reservoir.vue'+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 { exportData } from '@/utils/exportTable'++const xTableWarehouseArea = ref()++const data = reactive({+ showDialog: false,+ dialogForm: ref<WarehouseAreaVO>({+ id: 0,+ parent_id: 0,+ warehouse_name: '',+ area_name: '',+ area_property: AreaProperty.picking_area,+ is_valid: true+ }),+ searchForm: {+ warehouse_name: '',+ area_name: ''+ },+ activeTab: null,+ tableData: ref<WarehouseAreaVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ parent_id: 0,+ warehouse_name: '',+ area_name: '',+ area_property: AreaProperty.picking_area,+ 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.getWarehouseAreaList()+ },+ getWarehouseAreaList: async () => {+ const { data: res } = await getWarehouseAreaList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ editRow(row: WarehouseAreaVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: WarehouseAreaVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteWarehouseArea(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.getWarehouseAreaList()+ }),+ exportTable: () => {+ const $table = xTableWarehouseArea.value+ exportData({+ table: $table,+ filename: i18n.global.t('base.warehouseSetting.reservoirSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getWarehouseAreaList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getWarehouseAreaList: method.getWarehouseAreaList+})+</script>++<style lang="less" scoped>+.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/warehouseSetting/tab-warehouse.vue b/frontend/src/view/base/warehouseSetting/tab-warehouse.vuenew file mode 100644index 0000000..f0e2073--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/tab-warehouse.vue@@ -0,0 +1,296 @@+<template>+ <div class="operateArea">+ <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-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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.warehouse_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.warehouse_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.city"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.city')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.manager"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('base.warehouseSetting.manager')"+ 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="xTableWarehouse" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <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-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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <add-or-update-dialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <import-table :show-dialog="data.showDialogImport" @close="method.closeDialogImport" @saveSuccess="method.saveSuccessImport" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseVO } from '@/types/Base/Warehouse'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { deleteWarehouse, getWarehouseList } from '@/api/base/warehouseSetting'+import tooltipBtn from '@/components/tooltip-btn.vue'+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 { DEBOUNCE_TIME } from '@/constant/system'+import { SearchObject } from '@/types/System/Form'+import importTable from './import-table.vue'+import { exportData } from '@/utils/exportTable'++const xTableWarehouse = ref()++const data = reactive({+ showDialog: false,+ showDialogImport: false,++ dialogForm: {+ id: 0,+ warehouse_name: '',+ city: '',+ address: '',+ contact_tel: '',+ email: '',+ manager: '',+ is_valid: true+ },+ searchForm: {+ warehouse_name: '',+ city: '',+ manager: ''+ },+ activeTab: null,+ tableData: ref<WarehouseVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ warehouse_name: '',+ city: '',+ address: '',+ contact_tel: '',+ email: '',+ manager: '',+ 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()+ },+ // Import Dialog+ openDialogImport: () => {+ data.showDialogImport = true+ },+ closeDialogImport: () => {+ data.showDialogImport = false+ },+ saveSuccessImport: () => {+ method.refresh()+ method.closeDialogImport()+ },+ // Refresh data+ refresh: () => {+ method.getWarehouseList()+ },+ getWarehouseList: 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+ },+ editRow(row: WarehouseVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: WarehouseVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteWarehouse(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.getWarehouseList()+ }),+ exportTable: () => {+ const $table = xTableWarehouse.value+ exportData({+ table: $table,+ filename: i18n.global.t('base.warehouseSetting.warehouseSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getWarehouseList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getWarehouseList: method.getWarehouseList+})+</script>++<style lang="less" scoped>+.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/warehouseSetting/warehouseSetting.vue b/frontend/src/view/base/warehouseSetting/warehouseSetting.vuenew file mode 100644index 0000000..ffbd1d3--- /dev/null+++ b/frontend/src/view/base/warehouseSetting/warehouseSetting.vue@@ -0,0 +1,110 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabWarehouse">+ <tab-warehouse ref="tabWarehouseRef" />+ </v-window-item>+ <v-window-item value="tabReservoir">+ <tab-reservoir ref="tabReservoirRef" />+ </v-window-item>+ <v-window-item value="tabLocation">+ <tab-location ref="tabLocationRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabWarehouse from './tab-warehouse.vue'+import tabReservoir from './tab-reservoir.vue'+import tabLocation from './tab-location.vue'++const tabWarehouseRef = ref()+const tabReservoirRef = ref()+const tabLocationRef = ref()++const tabsConfig = [+ {+ value: 'tabWarehouse',+ icon: 'mdi-warehouse',+ tabName: i18n.global.t('base.warehouseSetting.warehouseSetting')+ },+ {+ value: 'tabReservoir',+ icon: 'mdi-texture-box',+ tabName: i18n.global.t('base.warehouseSetting.reservoirSetting')+ },+ {+ value: 'tabLocation',+ icon: 'mdi-library-shelves ',+ tabName: i18n.global.t('base.warehouseSetting.locationSetting')+ }+]++const data = reactive({+ activeTab: '',+ isLoadWarehouseData: false,+ isLoadReservoirData: false,+ isLoadLocationData: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabWarehouse':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabWarehouseRef?.value?.getWarehouseList) {+ tabWarehouseRef.value.getWarehouseList()+ }+ break+ case 'tabReservoir':+ if (tabReservoirRef?.value?.getWarehouseAreaList) {+ tabReservoirRef.value.getWarehouseAreaList()+ }+ break+ case 'tabLocation':+ if (tabLocationRef?.value?.getGoodsLocationList) {+ tabLocationRef.value.getGoodsLocationList()+ }+ break+ }+ })+ }+})++onMounted(() => {})+</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/add-or-update-shipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vuenew file mode 100644index 0000000..c633cd4--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/add-or-update-shipment.vue@@ -0,0 +1,327 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('router.sideBar.deliveryManagement')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.customer_name"+ :items="data.combobox.customer_name"+ item-title="label"+ item-value="label"+ :rules="data.rules.customer_name"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="outlined"+ clearable+ @update:model-value="method.customerNameChange"+ ></v-select>+ <v-row v-for="(item, index) of data.form.detailList" :key="index" style="margin-top: 5px">+ <!-- <v-select+ v-model="item.sku_id"+ :items="data.combobox.sku_code"+ item-title="label"+ item-value="value"+ :rules="data.rules.sku_id"+ :label="$t('wms.deliveryManagement.sku_code')"+ variant="outlined"+ clearable+ ></v-select> -->+ <v-col :cols="3">+ <v-text-field v-model="item.spu_name" :label="$t('wms.deliveryManagement.spu_name')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field+ v-model="item.spu_code"+ :label="$t('wms.deliveryManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ ></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field v-model="item.sku_code" :label="$t('wms.deliveryManagement.sku_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="2">+ <v-text-field+ v-model="item.qty"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </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, nextTick } from 'vue'+import { DeliveryManagementVO, DeliveryManagementDetailListVO, addRequestVO } from '@/types/DeliveryManagement/DeliveryManagement'+import i18n from '@/languages/i18n'+import { errorColor } from '@/constant/style'+import { hookComponent } from '@/components/system/index'+import { addShipment } from '@/api/wms/deliveryManagement'+import { getSupplierAll } from '@/api/base/supplier'+import tooltipBtn from '@/components/tooltip-btn.vue'+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'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: DeliveryManagementVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ curSelectType: '',+ showSkuDialogSelect: false,+ dialogTitle: '',+ form: ref<DeliveryManagementVO>({+ id: 0,+ detailList: []+ }),+ removeDetailList: ref<DeliveryManagementDetailListVO[]>([]),+ combobox: ref<{+ customer_name: {+ label: string+ value: number+ }[]+ }>({+ customer_name: []+ }),+ rules: {+ customer_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.customer_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.sku_code') }!`],+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ]+ }+})++const method = reactive({+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ sureSelect: (selectRecords: CommodityDetailJoinMainVO[]) => {+ if (data.curSelectType === 'target') {+ for (const item of selectRecords) {+ const index = data.form.detailList.findIndex((fi) => fi.sku_id === item.sku_id)+ if (index === -1) {+ data.form.detailList.push({+ id: 0,+ sku_id: item.sku_id,+ spu_code: item.spu_code,+ spu_name: item.spu_name,+ sku_name: item.sku_name,+ sku_code: item.sku_code,+ qty: 0+ })+ }+ }+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ data.showSkuDialogSelect = false+ }+ },+ clearCommodity: (item: DeliveryManagementDetailListVO) => {+ item.sku_id = 0+ item.sku_code = ''+ item.spu_code = ''+ item.spu_name = ''+ },+ // When customers change+ customerNameChange: (val: string) => {+ if (!val) {+ data.form.customer_id = 0+ } else {+ data.form.customer_id = data.combobox.customer_name.filter((item) => item.label === val)[0].value+ }+ },+ // Add a new detail+ AddDetail: () => {+ data.form.detailList.push({ id: 0, qty: 0 })+ // Let the scroll bar go to the bottom, Improve user experience+ const carText = document.querySelector('.formCard')+ if (carText && carText.scrollHeight > carText.clientHeight) {+ nextTick(() => {+ // Set scroll bar to the bottom+ carText.scrollTop = carText.scrollHeight+ })+ }+ },+ // Get dialog type, add or update+ getDialogType: () => {+ // This is special because this document is not actually a table,+ // but the data associated with another table.+ // so directly use the details to determine whether it is a new document+ if (props.form.detailList.length > 0) {+ data.dialogTitle = 'update'+ } else {+ data.dialogTitle = 'add'+ }+ },+ // Get the options required by the drop-down box+ getCombobox: async () => {+ data.combobox.customer_name = []+ const { data: supplierRes } = await getSupplierAll()+ if (!supplierRes.isSuccess) {+ return+ }+ for (const item of supplierRes.data) {+ if (item.is_valid) {+ data.combobox.customer_name.push({+ label: item.supplier_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'])) {+ 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 reqList: addRequestVO[] = []+ for (const item of data.form.detailList) {+ reqList.push({+ customer_id: data.form.customer_id ? data.form.customer_id : 0,+ customer_name: data.form.customer_name ? data.form.customer_name : '',+ qty: item.qty,+ sku_id: item.sku_id ? item.sku_id : 0+ })+ }+ const { data: res } = await addShipment(reqList)+ // const { data: res } = data.dialogTitle === 'add'+ // : await updateRoleMenu({ ...data.form, detailList: [...data.form.detailList, ...data.removeDetailList] }) // Merge the deleted list and the original list+ 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: DeliveryManagementDetailListVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (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.getDialogType()+ method.getCombobox()+ data.form = props.form+ }+ }+)+</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/deliveryManagement/deliveryManagement/confirm-order.vue b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vuenew file mode 100644index 0000000..8bbe40b--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue@@ -0,0 +1,254 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.confirmOrder')}`"></v-toolbar>+ <v-card-text>+ <v-row>+ <v-col :cols="5">+ <vxe-table+ ref="xTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.treeData"+ :height="'500px'"+ align="center"+ :cell-style="method.cellStyle"+ @cell-click="method.cellClick"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="40"></vxe-column>+ <vxe-column width="40">+ <template #default="{ row }">+ <div style="height: 100%; display: flex; align-items: center; justify-content: center">+ <vxe-checkbox v-model="row.confirm"></vxe-checkbox>+ </div>+ </template>+ </vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.deliveryManagement.spu_name')"> </vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.deliveryManagement.spu_code')"> </vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.deliveryManagement.sku_code')">+ <template #default="{ row }">+ <span :style="data.validList.includes(row.sku_code) ? 'color: red' : ''">{{ row.sku_code }}</span>+ </template>+ </vxe-column>+ </vxe-table>+ <!-- <v-card :height="tableHeight"> -->+ <!-- <NavListVue+ :list-data="data.treeData"+ :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="7">+ <vxe-table+ ref="detailXTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="'500px'"+ align="center"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRules"+ >+ <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.stock.warehouse')"> </vxe-column>+ <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="pick_qty" :title="$t('wms.deliveryManagement.detailQty')" :edit-render="{}">+ <template #edit="{ row }">+ <vxe-input v-model="row.pick_qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ </vxe-table>+ </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.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { ConfirmOrderVO, ConfirmOrderPickListVO } from '@/types/DeliveryManagement/DeliveryManagement'+import i18n from '@/languages/i18n'+import { getConfirmOrderInfoAndStock, confirmOrder } from '@/api/wms/deliveryManagement'+import { hookComponent } from '@/components/system/index'+import { isInteger } from '@/utils/dataVerification/tableRule'++const xTable = ref()+const detailXTable = ref()++const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ confirmOrderNo: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ navListOptions: {+ title: i18n.global.t('wms.deliveryManagement.orderDetail'),+ labelKey: 'sku_code',+ indexKey: 'sku_code',+ indexValue: ''+ },+ treeData: ref<ConfirmOrderVO[]>([]),+ tableData: ref<ConfirmOrderPickListVO[]>([]),+ // List of verification results for each commodity+ validList: ref<string[]>([]),+ validRules: ref<any>({+ pick_qty: [+ {+ validator: isInteger,+ validNumerical: 'nonNegative',+ trigger: 'change'+ }+ ]+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ beforeSubmit: (): boolean => {+ // let flag = true+ data.validList = []+ const msgList: string[] = []+ let orderCount = 0+ if (data.treeData.filter((fl) => fl.confirm).length <= 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.deliveryManagement.NoItemSelected')+ })+ return false+ }+ for (const item of data.treeData) {+ if (item.confirm) {+ let count = 0+ for (const dItem of item.pick_list) {+ count += Number(dItem.pick_qty)+ }+ orderCount += count+ if (count > item.qty) {+ data.validList.push(item.sku_code)+ msgList.push(`${ item.sku_code } ${ i18n.global.t('wms.deliveryManagement.quantityOverflow') } ${ item.qty }`)+ // flag = false+ }+ if (count === 0) {+ if (!data.validList.includes(item.sku_code)) {+ data.validList.push(item.sku_code)+ }+ msgList.push(`${ item.sku_code } ${ i18n.global.t('wms.deliveryManagement.detailQuantityIsZero') }!`)+ }+ }+ }+ // return flag+ if (msgList.length > 0) {+ hookComponent.$message({+ type: 'error',+ content: msgList.join(';\n')+ })+ return false+ }+ if (orderCount <= 0) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('wms.deliveryManagement.quantityIsZero')+ })+ return false+ }+ return true+ },+ submit: async () => {+ const $table = detailXTable.value+ const errMap = await $table.validate(true)+ if (errMap) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ return+ }+ if (method.beforeSubmit()) {+ // console.log(data.treeData)+ const { data: res } = await confirmOrder(data.treeData)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: i18n.global.t('wms.deliveryManagement.confirmSuccess')+ })+ emit('saveSuccess')+ }+ },+ getInfoByNo: async () => {+ const { data: res } = await getConfirmOrderInfoAndStock(props.confirmOrderNo)+ if (!res.isSuccess) {+ return+ }+ data.treeData = res.data+ data.tableData = []+ if (data.treeData.length > 0) {+ method.cellClick({ row: data.treeData[0] })+ }+ },+ cellClick: ({ row }: { row: ConfirmOrderVO }) => {+ data.navListOptions.indexValue = row.sku_code+ data.tableData = row.pick_list+ },+ // When clicking the left tree+ navListClick: (item: ConfirmOrderVO) => {+ data.navListOptions.indexValue = item.sku_code+ data.tableData = item.pick_list+ },+ cellStyle: ({ row }: { row: ConfirmOrderVO }) => {+ const style: any = { cursor: 'pointer' }+ if (row.sku_code === data.navListOptions.indexValue) {+ style.backgroundColor = '#e6dafd'+ }+ return style+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getInfoByNo()+ }+ }+)+</script>++<style scoped lang="less">+.detailBtnContainer {+ height: 56px;+ display: flex;+ justify-content: center;+ align-items: center;+}+</style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue b/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vuenew file mode 100644index 0000000..ea018f7--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/deliveryManagement.vue@@ -0,0 +1,255 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabShipment">+ <tabShipment ref="tabShipmentRef" />+ </v-window-item>+ <v-window-item value="tabPreShipment">+ <tabPreShipment ref="tabPreShipmentRef" />+ </v-window-item>+ <v-window-item value="tabNewShipment">+ <tabNewShipment ref="tabNewShipmentRef" />+ </v-window-item>+ <v-window-item value="tabGoodsToBePicked">+ <tabGoodsToBePicked ref="tabGoodsToBePickedRef" />+ </v-window-item>+ <v-window-item value="tabPicked">+ <tabPicked ref="tabPickedRef" />+ </v-window-item>+ <v-window-item value="tabToBePackaged">+ <tabToBePackaged ref="tabToBePackagedRef" />+ </v-window-item>+ <v-window-item value="tabPackaged">+ <tabPackaged ref="tabPackagedRef" />+ </v-window-item>+ <v-window-item value="tabToBeWeighed">+ <tabToBeWeighed ref="tabToBeWeighedRef" />+ </v-window-item>+ <v-window-item value="tabWeighed">+ <tabWeighed ref="tabWeighedRef" />+ </v-window-item>+ <v-window-item value="tabToBeDelivered">+ <tabToBeDelivered ref="tabToBeDeliveredRef" />+ </v-window-item>+ <v-window-item value="tabDelivered">+ <tabDelivered ref="tabDeliveredRef" />+ </v-window-item>+ <v-window-item value="tabSignIn">+ <tabSignIn ref="tabSignInRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabShipment from './tabShipment.vue'+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 tabPackaged from './tabPackaged.vue'+import tabToBeWeighed from './tabToBeWeighed.vue'+import tabWeighed from './tabWeighed.vue'+import tabToBeDelivered from './tabToBeDelivered.vue'+import tabDelivered from './tabDelivered.vue'+import tabSignIn from './tabSignIn.vue'++const tabShipmentRef = ref()+const tabPreShipmentRef = ref()+const tabNewShipmentRef = ref()+const tabGoodsToBePickedRef = ref()+const tabPickedRef = ref()+const tabToBePackagedRef = ref()+const tabPackagedRef = ref()+const tabToBeWeighedRef = ref()+const tabWeighedRef = ref()+const tabToBeDeliveredRef = ref()+const tabDeliveredRef = ref()+const tabSignInRef = ref()++const tabsConfig = [+ {+ value: 'tabShipment',+ icon: 'mdi-clipboard-list',+ tabName: i18n.global.t('wms.deliveryManagement.shipment')+ },+ {+ value: 'tabPreShipment',+ icon: 'mdi-list-box-outline',+ tabName: i18n.global.t('wms.deliveryManagement.preShipment')+ },+ {+ value: 'tabNewShipment',+ icon: 'mdi-list-box',+ tabName: i18n.global.t('wms.deliveryManagement.newShipment')+ },+ {+ value: 'tabGoodsToBePicked',+ icon: 'mdi-dolly',+ tabName: i18n.global.t('wms.deliveryManagement.goodsToBePicked')+ },+ {+ value: 'tabPicked',+ 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: 'tabPackaged',+ 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: 'tabWeighed',+ icon: 'mdi-weight',+ tabName: i18n.global.t('wms.deliveryManagement.weighed')+ },+ {+ value: 'tabToBeDelivered',+ icon: 'mdi-send-outline',+ tabName: i18n.global.t('wms.deliveryManagement.toBeDelivered')+ },+ {+ value: 'tabDelivered',+ icon: 'mdi-send',+ tabName: i18n.global.t('wms.deliveryManagement.outOfWarehouse')+ },+ {+ value: 'tabSignIn',+ icon: 'mdi-check-circle',+ tabName: i18n.global.t('wms.deliveryManagement.signedIn')+ }+]++const data = reactive({+ activeTab: '',+ isLoadstockLocation: false,+ isLoadstock: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabShipment':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabShipmentRef?.value?.getShipment) {+ tabShipmentRef.value.getShipment()+ }+ break+ case 'tabPreShipment':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabPreShipmentRef?.value?.getPreShipment) {+ tabPreShipmentRef.value.getPreShipment()+ }+ break+ case 'tabNewShipment':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabNewShipmentRef?.value?.getNewShipment) {+ tabNewShipmentRef.value.getNewShipment()+ }+ break+ case 'tabGoodsToBePicked':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabGoodsToBePickedRef?.value?.getGoodsToBePicked) {+ tabGoodsToBePickedRef.value.getGoodsToBePicked()+ }+ break+ case 'tabToBePackaged':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabToBePackagedRef?.value?.getToBePackaged) {+ tabToBePackagedRef.value.getToBePackaged()+ }+ break+ case 'tabPackaged':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabPackagedRef?.value?.getPackaged) {+ tabPackagedRef.value.getPackaged()+ }+ break+ case 'tabToBeWeighed':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabToBeWeighedRef?.value?.getToBeWeighed) {+ tabToBeWeighedRef.value.getToBeWeighed()+ }+ break+ case 'tabWeighed':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabWeighedRef?.value?.getWeighed) {+ tabWeighedRef.value.getWeighed()+ }+ break+ case 'tabPicked':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabPickedRef?.value?.getPicked) {+ tabPickedRef.value.getPicked()+ }+ break+ case 'tabToBeDelivered':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabToBeDeliveredRef?.value?.getToBeDelivery) {+ tabToBeDeliveredRef.value.getToBeDelivery()+ }+ break+ case 'tabDelivered':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabDeliveredRef?.value?.getDelivery) {+ tabDeliveredRef.value.getDelivery()+ }+ break+ case 'tabSignIn':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabSignInRef?.value?.getSignIn) {+ tabSignInRef.value.getSignIn()+ }+ break+ }+ })+ }+})++onMounted(() => {})+</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/package-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vuenew file mode 100644index 0000000..4625c1d--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/package-confirm.vue@@ -0,0 +1,140 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="dialogTitle"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-row v-for="(item, index) of data.list" :key="index">+ <v-col :cols="3">+ <v-text-field v-model="item.spu_name" :label="$t('wms.deliveryManagement.spu_name')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="3">+ <v-text-field v-model="item.spu_code" :label="$t('wms.deliveryManagement.spu_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="isWeight ? 2 : 3">+ <v-text-field v-model="item.sku_code" :label="$t('wms.deliveryManagement.sku_code')" variant="outlined" readonly></v-text-field>+ </v-col>+ <v-col :cols="isWeight ? 2 : 3">+ <v-text-field+ v-model="item.qty"+ :rules="data.rules.qty"+ :label="isSignIn ? $t('wms.deliveryManagement.damagedQuantity') : $t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ <v-col v-if="isWeight" :cols="2">+ <v-text-field+ v-model="item.weight"+ :rules="data.rules.weight"+ :label="$t('wms.deliveryManagement.detailWeight') + '(' + item.weight_unit + ')'"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col>+ </v-row>+ </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 { ref, reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger, IsDecimal } from '@/utils/dataVerification/formRule'+import { ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ dataList: ConfirmItem[]+ isWeight: boolean+ isSignIn?: boolean+ dialogTitle: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ 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')+ ],+ 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)+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (props.isSignIn) {+ const verificationFailedList = data.list.filter(+ (item) => IsInteger(item.qty, 'nonNegative') !== ''+ || Number(item.qty) < 0+ || Number(item.qty) > item.maxQty+ )+ if (verificationFailedList.length > 0) {+ const errMsgStrList = verificationFailedList.map(+ (item) => `${ item.sku_code }: ${ i18n.global.t('wms.deliveryManagement.exceedingQuantity') }${ item.maxQty }`+ )+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.invalidValue') }; ${ errMsgStrList.join('; ') }`+ })+ } else {+ hookComponent.$dialog({+ 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(+ (item) => IsInteger(item.qty, 'greaterThanZero') !== ''+ || Number(item.qty) <= 0+ || Number(item.qty) > item.maxQty+ || (item.weight && IsDecimal(item.weight, 'nonNegative', 15, 3) !== '')+ )+ if (verificationFailedList.length > 0) {+ const errMsgStrList = verificationFailedList.map(+ (item) => `${ item.sku_code }: ${ i18n.global.t('wms.deliveryManagement.exceedingQuantity') }${ item.maxQty }`+ )+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.invalidValue') }; ${ errMsgStrList.join('; ') }`+ })+ } else {+ emit('submit', data.list)+ }+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.list = props.dataList+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vuenew file mode 100644index 0000000..e4e7e60--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue@@ -0,0 +1,87 @@+<template>+ <v-dialog v-model="isShow" :width="'70%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.ViewInventoryDetails')}`"></v-toolbar>+ <v-card-text>+ <vxe-table+ ref="detailXTable"+ keep-source+ :column-config="{ minWidth: '100px' }"+ :data="data.tableData"+ :height="'500px'"+ align="center"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <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="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="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>+ <vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column>+ <!-- <vxe-column field="pick_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column> -->+ <vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></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, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import { viewInventoryDetails } from '@/api/wms/deliveryManagement'+import i18n from '@/languages/i18n'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ id: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ tableData: []+})++const method = reactive({+ getTableData: async () => {+ const { data: res } = await viewInventoryDetails(props.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ },+ closeDialog: () => {+ emit('close')+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getTableData()+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/shipmentFun.ts b/frontend/src/view/deliveryManagement/deliveryManagement/shipmentFun.tsnew file mode 100644index 0000000..19f98e6--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/shipmentFun.ts@@ -0,0 +1,23 @@+import i18n from '@/languages/i18n'++// Get the status display according to the key value+export function getShipmentState(state: number) {+ switch (state) {+ case 0:+ return i18n.global.t('wms.deliveryManagement.preShipment')+ case 1:+ return i18n.global.t('wms.deliveryManagement.newShipment')+ case 2:+ return i18n.global.t('wms.deliveryManagement.goodsToBePicked')+ case 3:+ return i18n.global.t('wms.deliveryManagement.picked')+ case 4:+ return i18n.global.t('wms.deliveryManagement.packaged')+ case 5:+ return i18n.global.t('wms.deliveryManagement.weighed')+ case 6:+ return i18n.global.t('wms.deliveryManagement.outOfWarehouse')+ case 7:+ return i18n.global.t('wms.deliveryManagement.signedIn')+ }+}\ No newline at end of filediff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vuenew file mode 100644index 0000000..f6c9673--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue@@ -0,0 +1,394 @@+<template>+ <div class="operateArea">+ <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-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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <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="operate" :title="$t('system.page.operate')" width="140" :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+ :flat="true"+ icon="mdi-email-check"+ :tooltip-text="$t('wms.deliveryManagement.signIn')"+ @click="method.handleSignIn(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>+ <!-- <ToBeSignInConfirm+ :show-dialog="data.showDialog"+ :dialog-default-qty="data.dialogDefaultQty"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ /> -->+ <SignInConfirm+ :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" />+ <ToBeFreightfee :show-dialog="data.showSetFreight" @close="method.freightfeeClose" @submit="method.freightfeeSubmit" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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 tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+// import ToBeSignInConfirm from './to-be-sign-in-confirm.vue'+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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showSetFreight: false,+ showDialog: false,+ dialogDefaultQty: 0,+ packageRow: ref<DeliveryManagementDetailVO>(),+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ }),+ confirmList: ref<ConfirmItem[]>([])+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ setFreight: () => {+ const $table = xTable.value+ if ($table.getCheckboxRecords().length > 0) {+ data.showSetFreight = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ freightfeeClose: () => {+ data.showSetFreight = false+ },+ freightfeeSubmit: async (form: { carrier: string; freightfee_id: number; waybill_no: string }) => {+ const reqList: SetCarrierVO[] = []+ const $table = xTable.value+ for (const item of $table.getCheckboxRecords()) {+ reqList.push({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ freightfee_id: form.freightfee_id,+ carrier: form.carrier,+ waybill_no: form.waybill_no+ })+ }+ const { data: res } = await setCarrier(reqList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.freightfeeClose()+ method.refresh()+ },+ dialogClose: () => {+ data.showDialog = false+ },+ // Callback after entering packaging value+ dialogSubmit: async (list: ConfirmItem[]) => {+ const SingInList = list.map((item) => ({+ id: item.id,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status,+ damage_qty: item.qty+ }))++ const { data: res } = await handleSignIn(SingInList)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.dialogClose()+ method.refresh()+ // if (data.packageRow) {+ // const { data: res } = await handleSignIn([+ // {+ // id: data.packageRow.id,+ // dispatch_no: data.packageRow.dispatch_no,+ // dispatch_status: data.packageRow.dispatch_status,+ // damage_qty: qty+ // }+ // ])+ // if (!res.isSuccess) {+ // hookComponent.$message({+ // type: 'error',+ // content: res.errorMessage+ // })+ // return+ // }+ // hookComponent.$message({+ // type: 'success',+ // content: res.data+ // })+ // method.dialogClose()+ // method.refresh()+ // }+ },+ handleSignIn: 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.picked_qty,+ qty: 0,+ dispatch_no: item.dispatch_no,+ dispatch_status: item.dispatch_status+ })+ }+ data.confirmList = confirmList+ data.showDialog = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ // data.packageRow = row+ // data.dialogDefaultQty = row.picked_qty ? row.picked_qty : 0+ // data.showDialog = true+ },+ // Refresh data+ refresh: () => {+ method.getDelivery()+ },+ getDelivery: async () => {+ const { data: res } = await getDelivery(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.getDelivery()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.outOfWarehouse'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getDelivery()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getDelivery: method.getDelivery+})+</script>++<style lang="less" scoped>+.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/tabGoodsToBePicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vuenew file mode 100644index 0000000..2d16f62--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue@@ -0,0 +1,238 @@+<template>+ <div class="operateArea">+ <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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpicked_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column>+ <vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </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="120" :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>+ </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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getGoodsToBePicked } 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Refresh data+ refresh: () => {+ method.getGoodsToBePicked()+ },+ getGoodsToBePicked: async () => {+ const { data: res } = await getGoodsToBePicked(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.getGoodsToBePicked()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.goodsToBePicked'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getGoodsToBePicked()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getGoodsToBePicked: method.getGoodsToBePicked+})+</script>++<style lang="less" scoped>+.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/tabNewShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vuenew file mode 100644index 0000000..c010f37--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue@@ -0,0 +1,205 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_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: '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="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </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-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>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getNewShipment } 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 { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDialog: false,+ searchForm: {+ dispatch_no: '',+ customer_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ // Refresh data+ refresh: () => {+ method.getNewShipment()+ },+ getNewShipment: async () => {+ const { data: res } = await getNewShipment(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.getNewShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.newShipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getNewShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getNewShipment: method.getNewShipment+})+</script>++<style lang="less" scoped>+.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/tabPackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vuenew file mode 100644index 0000000..e88a649--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue@@ -0,0 +1,267 @@+<template>+ <div class="operateArea">+ <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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpackage_qty" :title="$t('wms.deliveryManagement.unpackage_qty')"></vxe-column>+ <vxe-column field="package_qty" :title="$t('wms.deliveryManagement.package_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </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="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="140" :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+ :flat="true"+ icon="mdi-arrow-u-left-top"+ :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ @click="method.backToThePreviousStep(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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } 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 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementDetailVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDetail(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getPackaged()+ },+ getPackaged: async () => {+ const { data: res } = await getPackaged(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.getPackaged()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.packaged'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPackaged()+ }+})++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getPackaged: method.getPackaged+})+</script>++<style lang="less" scoped>+.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/tabPicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vuenew file mode 100644index 0000000..e18810e--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue@@ -0,0 +1,238 @@+<template>+ <div class="operateArea">+ <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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpicked_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column>+ <vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('weight', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </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="120" :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>+ </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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getPicked } 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Refresh data+ refresh: () => {+ method.getPicked()+ },+ getPicked: async () => {+ const { data: res } = await getPicked(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.getPicked()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.picked'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPicked()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getPicked: method.getPicked+})+</script>++<style lang="less" scoped>+.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/tabPreShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vuenew file mode 100644index 0000000..1035523--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue@@ -0,0 +1,208 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_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: '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="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </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-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>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getPreShipment } 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 { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDialog: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ // Refresh data+ refresh: () => {+ method.getPreShipment()+ },+ getPreShipment: async () => {+ const { data: res } = await getPreShipment(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.getPreShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.preShipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPreShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getPreShipment: method.getPreShipment+})+</script>++<style lang="less" scoped>+.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/tabShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vuenew file mode 100644index 0000000..ee6bd27--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue@@ -0,0 +1,424 @@+<template>+ <div class="operateArea">+ <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-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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-select+ v-model="data.searchForm.dispatch_status"+ :items="data.combobox.dispatch_status"+ item-title="label"+ item-value="value"+ :label="$t('wms.deliveryManagement.dispatch_status')"+ variant="solo"+ density="comfortable"+ class="searchInput ml-5 mt-1"+ clearable+ hide-details+ ></v-select>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_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: '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="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 }">+ <span>{{ getShipmentState(row.dispatch_status) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </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="240" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn+ :disabled="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"+ :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"+ :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"+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <!-- Add or modify data mode window -->+ <addOrUpdateShipment :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <!-- Confirm Order -->+ <ConfirmOrder+ :confirm-order-no="data.confirmOrderNo"+ :show-dialog="data.showConfirmOrder"+ @close="method.closeConfirmOrder"+ @save-success="method.confirmSuccess"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getShipment, delShipment, cancelOrderByDispatch, confirmPicking } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import addOrUpdateShipment from './add-or-update-shipment.vue'+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 { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDialog: false,+ dialogForm: {+ id: 0,+ detailList: []+ },+ searchForm: ref<{+ dispatch_no: string+ customer_name: string+ dispatch_status?: string+ }>({+ dispatch_no: '',+ customer_name: ''+ }),+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ }),+ showConfirmOrder: false,+ confirmOrderNo: '',+ combobox: {+ dispatch_status: [+ {+ label: i18n.global.t('wms.deliveryManagement.preShipment'),+ value: '0'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.newShipment'),+ value: '1'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.goodsToBePicked'),+ value: '2'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.picked'),+ value: '3'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.packaged'),+ value: '4'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.weighed'),+ value: '5'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.outOfWarehouse'),+ value: '6'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.signedIn'),+ value: '7'+ }+ ]+ }+})++const method = reactive({+ // Confirm picking+ confirmPicking: async (row: DeliveryManagementVO) => {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmPicking') }?`,+ handleConfirm: async () => {+ if (row.dispatch_no) {+ const { data: res } = await confirmPicking(row.dispatch_no)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ }+ })+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDispatch({+ dispatch_no: row.dispatch_no,+ dispatch_status: row.dispatch_status+ })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Close the order confirmation window+ closeConfirmOrder: () => {+ data.showConfirmOrder = false+ },+ // After confirming the shipment document+ confirmSuccess: () => {+ method.refresh()+ method.closeConfirmOrder()+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // Refresh dialog data+ clearDialogForm: () => {+ data.dialogForm = {+ id: 0,+ detailList: []+ }+ },+ add: () => {+ method.clearDialogForm()+ data.showDialog = true+ },+ confirmOrder: (row: DeliveryManagementVO) => {+ if (row.dispatch_status === undefined || ![0, 1].includes(row.dispatch_status)) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.incorrectStatusMsg') }${ getShipmentState(0) }${ i18n.global.t(+ 'wms.deliveryManagement.or'+ ) }${ getShipmentState(1) }`+ })+ return+ }+ if (row.dispatch_no) {+ data.confirmOrderNo = row.dispatch_no+ data.showConfirmOrder = true+ }+ },+ deleteRow: (row: DeliveryManagementVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.dispatch_no) {+ const { data: res } = await delShipment(row.dispatch_no)+ 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()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getShipment()+ },+ getShipment: async () => {+ const { data: res } = await getShipment(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.getShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.shipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm, ['dispatch_status'])+ method.getShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getShipment: method.getShipment+})+</script>++<style lang="less" scoped>+.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/tabSignIn.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vuenew file mode 100644index 0000000..1db30c6--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue@@ -0,0 +1,252 @@+<template>+ <div class="operateArea">+ <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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="weighing_person" :title="$t('wms.deliveryManagement.weighing_person')"></vxe-column>+ <vxe-column field="waybill_no" :title="$t('wms.deliveryManagement.waybill_no')"></vxe-column>+ <vxe-column field="carrier" :title="$t('wms.deliveryManagement.carrier')"></vxe-column>+ <vxe-column field="damagedQuantity" :title="$t('wms.deliveryManagement.damagedQuantity')">+ <template #default="{ row }">+ <span>{{ `${XEUtils.subtract(Number(row.qty), Number(row.sign_qty))}` }}</span>+ </template>+ </vxe-column>++ <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="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-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import XEUtils from 'xe-utils'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getSignIn } 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Refresh data+ refresh: () => {+ method.getSignIn()+ },+ getSignIn: async () => {+ const { data: res } = await getSignIn(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.getSignIn()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.signedIn'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getSignIn()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getSignIn: method.getSignIn+})+</script>++<style lang="less" scoped>+.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/tabToBeDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vuenew file mode 100644index 0000000..a4eec17--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeDelivered.vue@@ -0,0 +1,285 @@+<template>+ <div class="operateArea">+ <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-cube-send" :tooltip-text="$t('wms.deliveryManagement.delivery')" @click="method.handleDeliver"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <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="operate" :title="$t('system.page.operate')" width="140" :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+ :flat="true"+ icon="mdi-cube-send"+ :tooltip-text="$t('wms.deliveryManagement.delivery')"+ @click="method.handleDeliver(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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getToBeDelivery, handleDelivery } 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ handleDeliver: async () => {+ const $table = xTable.value+ 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+ }))+ 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) {+ 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('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ // Refresh data+ refresh: () => {+ method.getToBeDelivery()+ },+ getToBeDelivery: async () => {+ const { data: res } = await getToBeDelivery(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.getToBeDelivery()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.toBeDelivered'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getToBeDelivery()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getToBeDelivery: method.getToBeDelivery+})+</script>++<style lang="less" scoped>+.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/tabToBePackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vuenew file mode 100644index 0000000..0c1c8f8--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBePackaged.vue@@ -0,0 +1,322 @@+<template>+ <div class="operateArea">+ <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-package-down" :tooltip-text="$t('wms.deliveryManagement.package')" @click="method.handlePackage"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="unpackage_qty" :title="$t('wms.deliveryManagement.unpackage_qty')"></vxe-column>+ <vxe-column field="package_qty" :title="$t('wms.deliveryManagement.package_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </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="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="140" :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+ :flat="true"+ icon="mdi-package-down"+ :tooltip-text="$t('wms.deliveryManagement.package')"+ @click="method.handlePackage(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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <!-- <ToBePackageConfirm :show-dialog="data.showDialog" :max-qty="data.dialogMaxQty" @close="method.dialogClose" @submit="method.dialogSubmit" /> -->+ <PackageConfirm+ :dialog-title="$t('wms.deliveryManagement.package')"+ :show-dialog="data.showDialog"+ :is-weight="false"+ :data-list="data.confirmList"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getToBePackaged, handlePackage } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+// import ToBePackageConfirm from './to-be-package-confirm.vue'+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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showDialog: false,+ confirmList: ref<ConfirmItem[]>([]),+ dialogMaxQty: 0,+ packageRow: ref<DeliveryManagementDetailVO>(),+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ dialogClose: () => {+ data.showDialog = false+ },+ // 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) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.dialogClose()+ method.refresh()+ },+ // handlePackage: async (row: DeliveryManagementDetailVO) => {+ // data.packageRow = row+ // data.dialogMaxQty = row.unpackage_qty ? row.unpackage_qty : 0+ // data.showDialog = true+ // },+ 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+ })+ }+ data.confirmList = confirmList+ data.showDialog = true+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('base.userManagement.checkboxIsNull') }`+ })+ }+ },+ // Refresh data+ refresh: () => {+ method.getToBePackaged()+ },+ getToBePackaged: async () => {+ const { data: res } = await getToBePackaged(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.getToBePackaged()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.toBePackaged'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getToBePackaged()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getToBePackaged: method.getToBePackaged+})+</script>++<style lang="less" scoped>+.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/tabToBeWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vuenew file mode 100644index 0000000..326c754--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabToBeWeighed.vue@@ -0,0 +1,337 @@+<template>+ <div class="operateArea">+ <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-weight" :tooltip-text="$t('wms.deliveryManagement.weigh')" @click="method.handleWeigh"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <!-- <vxe-column field="weighing_person" :title="$t('wms.deliveryManagement.weighing_person')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </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="140" :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+ :flat="true"+ icon="mdi-weight"+ :tooltip-text="$t('wms.deliveryManagement.weigh')"+ @click="method.handleWeigh(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>+ <!-- <ToBeWeighedConfirm+ :show-dialog="data.showDialog"+ :default-weight="data.defaultWeight"+ :max-qty="data.dialogMaxQty"+ :weight-unit="data.dialogWeightUnit"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ /> -->+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <WeightConfirm+ :show-dialog="data.showDialog"+ :dialog-title="$t('wms.deliveryManagement.weigh')"+ :is-weight="true"+ :data-list="data.confirmList"+ @close="method.dialogClose"+ @submit="method.dialogSubmit"+ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO, ConfirmItem } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getToBeWeighed, 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'+import WeightConfirm from './package-confirm.vue'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showDialog: false,+ confirmList: ref<ConfirmItem[]>([]),+ dialogMaxQty: 0,+ dialogWeightUnit: '',+ defaultWeight: 0,+ weighedRow: ref<DeliveryManagementDetailVO>(),+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ dialogClose: () => {+ data.showDialog = false+ },+ // 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) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.dialogClose()+ method.refresh()+ // }+ },+ 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+ } 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+ },+ // Refresh data+ refresh: () => {+ method.getToBeWeighed()+ },+ getToBeWeighed: async () => {+ const { data: res } = await getToBeWeighed(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.getToBeWeighed()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.toBeWeighed'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getToBeWeighed()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getToBeWeighed: method.getToBeWeighed+})+</script>++<style lang="less" scoped>+.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/tabWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vuenew file mode 100644index 0000000..83b0574--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue@@ -0,0 +1,272 @@+<template>+ <div class="operateArea">+ <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>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </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.deliveryManagement.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: '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="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_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>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.order_qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.detailWeight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.detailVolume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', row.volume_unit)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>+ <vxe-column field="package_no" :title="$t('wms.deliveryManagement.package_no')"></vxe-column>+ <vxe-column field="weighing_person" :title="$t('wms.deliveryManagement.weighing_person')"></vxe-column>+ <vxe-column field="weighing_weight" :title="$t('wms.deliveryManagement.weighing_weight')">+ <template #default="{ row }">+ <span>{{ `${row.weighing_weight} ${GetUnit('weight', row.weight_unit)}` }}</span>+ </template>+ </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="140" :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+ :flat="true"+ icon="mdi-arrow-u-left-top"+ :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ @click="method.backToThePreviousStep(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>+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementDetailVO } 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 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 SearchDeliveredDetail from './search-delivered-detail.vue'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++const xTable = ref()++const data = reactive({+ showDeliveredDetailID: 0,+ showDeliveredDetail: false,+ showDialog: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: '',+ spu_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementDetailVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({+ closeDeliveredDetail: () => {+ data.showDeliveredDetail = false+ },+ viewRow: (row: DeliveryManagementDetailVO) => {+ data.showDeliveredDetailID = row.id+ data.showDeliveredDetail = true+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementDetailVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDetail(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getWeighed()+ },+ getWeighed: async () => {+ const { data: res } = await getWeighed(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.getWeighed()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.weighed'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getWeighed()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getWeighed: method.getWeighed+})+</script>++<style lang="less" scoped>+.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/to-be-freightfee.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vuenew file mode 100644index 0000000..a0c6515--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-freightfee.vue@@ -0,0 +1,120 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.setFreight')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.waybill_no"+ :rules="data.rules.waybill_no"+ :label="$t('wms.deliveryManagement.waybill_no')"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.carrier"+ :label="$t('wms.deliveryManagement.carrier')"+ variant="outlined"+ readonly+ clearable+ @click="method.openSelect()"+ @click:clear="method.valClearable"+ ></v-text-field>+ <v-text-field+ v-model="data.form.departure_city"+ :label="$t('wms.deliveryManagement.departure_city')"+ variant="outlined"+ readonly+ ></v-text-field>+ <v-text-field+ v-model="data.form.arrival_city"+ :label="$t('wms.deliveryManagement.arrival_city')"+ variant="outlined"+ readonly+ ></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>+ <freight-select :show-dialog="data.dialogSelect" @close="method.closeDialogSelect()" @sureSelect="method.sureSelect" />+ </template>+ </v-dialog>+</template>++<script lang="ts" setup>+import { reactive, computed, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import freightSelect from '@/components/select/freight-select.vue'+import { FreightVO } from '@/types/Base/Freight'+import { StringLength } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ dialogSelect: false,+ form: { carrier: '', freightfee_id: 0, departure_city: '', arrival_city: '', waybill_no: '' },+ combobox: {+ freightfee_id: []+ },+ rules: {+ waybill_no: [+ (val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)+ ]+ }+})++const method = reactive({+ openSelect: () => {+ data.dialogSelect = true+ },+ closeDialogSelect: () => {+ data.dialogSelect = false+ },+ sureSelect: (selectRecords: FreightVO[]) => {+ if (selectRecords.length > 0) {+ data.form.carrier = selectRecords[0].carrier+ data.form.freightfee_id = selectRecords[0].id ? selectRecords[0].id : 0+ data.form.departure_city = selectRecords[0].departure_city+ data.form.arrival_city = selectRecords[0].arrival_city+ }+ },+ valClearable: () => {+ data.form = { carrier: '', freightfee_id: 0, departure_city: '', arrival_city: '', waybill_no: data.form.waybill_no }+ },+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (data.form.carrier) {+ emit('submit', data.form)+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('system.checkText.mustSelect') }${ i18n.global.t('wms.deliveryManagement.carrier') }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = { carrier: '', freightfee_id: 0, departure_city: '', arrival_city: '', waybill_no: '' }+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vuenew file mode 100644index 0000000..8479202--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-package-confirm.vue@@ -0,0 +1,77 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.package')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.qty"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></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, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ maxQty: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: { qty: 0 },+ 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')+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (IsInteger(data.form.qty, 'greaterThanZero') === '' && Number(data.form.qty) > 0 && Number(data.form.qty) <= props.maxQty) {+ emit('submit', data.form.qty)+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.validQtyMsgPackage') }${ props.maxQty }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form.qty = props.maxQty+ }+ }+)+</script>++<style scoped lang="less"></style>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.vuenew file mode 100644index 0000000..00bd8d1--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-sign-in-confirm.vue@@ -0,0 +1,82 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.signIn')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.qty"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.damagedQuantity')"+ variant="outlined"+ clearable+ ></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, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ dialogDefaultQty: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: { qty: 0 },+ rules: {+ qty: [+ (val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.deliveryManagement.detailQty') }!`,+ (val: number) => IsInteger(val, 'nonNegative') === '' || IsInteger(val, 'nonNegative')+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (IsInteger(data.form.qty, 'nonNegative') === '' && Number(data.form.qty) >= 0 && Number(data.form.qty) <= props.dialogDefaultQty) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.irreversible') }, ${ i18n.global.t('wms.deliveryManagement.confirmSignIn') }?`,+ handleConfirm: async () => {+ emit('submit', data.form.qty)+ }+ })+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.validQtyMsgSignIn') }${ props.dialogDefaultQty }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form.qty = 0+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vuenew file mode 100644index 0000000..33f1a64--- /dev/null+++ b/frontend/src/view/deliveryManagement/deliveryManagement/to-be-weighed-confirm.vue@@ -0,0 +1,98 @@+<template>+ <v-dialog v-model="isShow" :width="'30%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card class="formCard">+ <v-toolbar color="white" :title="`${$t('wms.deliveryManagement.weigh')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.qty"+ style="margin-bottom: 5px"+ :rules="data.rules.qty"+ :label="$t('wms.deliveryManagement.detailQty')"+ variant="outlined"+ clearable+ ></v-text-field>+ <v-text-field+ v-model="data.form.weight"+ :label="$t('wms.deliveryManagement.detailWeight') + '(' + weightUnit + ')'"+ :rules="data.rules.weight"+ variant="outlined"+ clearable+ ></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, defineEmits, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import i18n from '@/languages/i18n'+import { IsInteger, IsDecimal } from '@/utils/dataVerification/formRule'++const emit = defineEmits(['close', 'submit'])++const props = defineProps<{+ showDialog: boolean+ maxQty: number+ defaultWeight: number+ weightUnit: string+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ form: { qty: 0, weight: 0 },+ 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')+ ],+ 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)+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ submit: () => {+ if (+ IsInteger(data.form.qty, 'greaterThanZero') === ''+ && IsDecimal(data.form.weight, 'nonNegative', 15, 3) === ''+ && Number(data.form.qty) > 0+ && Number(data.form.qty) <= props.maxQty+ && Number(data.form.weight) > 0+ ) {+ emit('submit', { weighing_qty: data.form.qty, weighing_weight: data.form.weight })+ } else {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.validQtyMsgPackage') }${ props.maxQty }!`+ })+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form.qty = props.maxQty+ data.form.weight = props.defaultWeight+ }+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/view/pageTemplate/PageTemplate.vue b/frontend/src/view/pageTemplate/PageTemplate.vuenew file mode 100644index 0000000..ed2dd70--- /dev/null+++ b/frontend/src/view/pageTemplate/PageTemplate.vue@@ -0,0 +1,245 @@+<template>+ <div class="container">+ <div>+ <!-- According to your own need to decide whether to the tab, if you don't need that you can delete <v-tabs> -->+ <v-tabs v-model="data.activeTab" stacked>+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <!-- If you have more than one tab, you should write more <v-window-item> and give it 'value' -->+ <v-window-item value="tabOne">+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"></tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <!--+ Don't delete v-col whether you don't need.+ If you only need one query, you should write:++ <v-col cols="4"></v-col>+ <v-col cols="4"></v-col>+ <v-col cols="4">Some Thing</v-col>+ -->+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.userName"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.userName1"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.userName2"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('login.userName')"+ 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" :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="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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onMounted } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'++const xTable = ref()++/**+ * Table Model, this just a example+ * You should put it on the 'types' folder+ */+interface UserVO {+ id: number+ name: string+ role: string+ sex: string+ age: number+ address: string+}++const tabsConfig = [+ {+ value: 'tabOne',+ icon: 'mdi-phone',+ tabName: 'tabOne'+ }+]++const data = reactive({+ // TODO Adjust the search prop what you want+ searchForm: {+ userName: '',+ userName1: '',+ userName2: ''+ },+ activeTab: null,+ tableData: ref<UserVO[]>([+ { id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, address: 'test abc' },+ { id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, address: 'Guangzhou' },+ { id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, address: 'Shanghai' },+ { id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 24, address: 'Shanghai' }+ ]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE+ })+})++const method = reactive({+ editRow(row: any) {+ console.log(row)+ },+ deleteRow(row: any) {+ console.log(row)+ },+ sureSearch: () => {+ console.log(data.searchForm)+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ // TODO Get datas what you want+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ // TODO Write filename according to your file.+ filename: i18n.global.t('base.warehouseSetting.locationSetting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ }+})++onMounted(() => {+ // TODO Get datas what you want+})++/**+ * computedCardHeight({ hasTab, hasOperate })+ * Must enter the params if you don't need tab or operate area+ * Defaultly, the 'hasTab' and 'hasOperate' are true+ */+const cardHeight = computed(() => computedCardHeight({}))++/**+ * computedTableHeight({ hasPager, hasTab, hasOperate })+ * Must enter the params if you don't need pager or tab or operate area+ * Defaultly, the 'hasPager' and 'hasTab' and 'hasOperate' are true+ */+const tableHeight = computed(() => computedTableHeight({}))+</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/warehouseWorking/warehouseAdjust/add-or-update-adjust.vue b/frontend/src/view/warehouseWorking/warehouseAdjust/add-or-update-adjust.vuenew file mode 100644index 0000000..fe33591--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseAdjust/add-or-update-adjust.vue@@ -0,0 +1,282 @@+<!-- Warehouse Adjust Operate Dialog -->+<template>+ <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.warehouseAdjust')}`"></v-toolbar>+ <v-card-text>+ <v-form ref="formRef">+ <v-select+ v-model="data.form.job_type"+ :items="data.combobox.job_type"+ item-title="label"+ item-value="value"+ :rules="data.rules.job_type"+ :label="$t('wms.warehouseWorking.warehouseAdjust.job_type')"+ variant="outlined"+ clearable+ :disabled="isAssociatedJobType"+ @update:model-value="method.changeJobType"+ ></v-select>+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('base.commodityManagement.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ :disabled="isAssociatedJobType"+ @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.warehouse_name"+ :label="$t('wms.warehouseWorking.warehouseAdjust.warehouse')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('wms.warehouseWorking.warehouseAdjust.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.qty"+ :label="$t('wms.warehouseWorking.warehouseAdjust.qty')"+ :rules="data.rules.qty"+ variant="outlined"+ ></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" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addStockAdjust } from '@/api/wms/warehouseAdjust'+import { WarehouseAdjustVO, AdjustJobType } from '@/types/WarehouseWorking/WarehouseAdjust'+import { removeObjectNull } from '@/utils/common'+import commoditySelect from '@/components/select/commodity-select.vue'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseAdjustVO+ // If 'associatedJobType' has value, the 'job_type' and 'sku' should be disabled.+ associatedJobType?: AdjustJobType+}>()++const isShow = computed(() => props.showDialog)+const isAssociatedJobType = computed(() => !!(props.associatedJobType && props.associatedJobType > 0))++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseAdjustVO>({+ id: 0,+ // job_type: AdjustJobType.UNKNOW,+ job_code: '',+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_update_stock: false,+ source_table_id: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ creator: '',+ create_time: ''+ }),+ rules: {+ job_type: [],+ qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.qty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')+ ],+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouse') }!`+ ],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.location_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],+ sku_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }!`]+ },+ combobox: ref<{+ job_type: {+ label: string+ value: AdjustJobType+ }[]+ }>({+ job_type: [+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseTake'),+ value: AdjustJobType.TAKE+ },+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.processCombine'),+ value: AdjustJobType.PROCESS_COMBINE+ },+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.processSplit'),+ value: AdjustJobType.PROCESS_SPLIT+ },+ {+ label: i18n.global.t('wms.warehouseWorking.warehouseAdjust.warehouseMove'),+ value: AdjustJobType.MOVE+ }+ ]+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },++ initForm: () => {+ data.form = props.form++ if (isAssociatedJobType.value) {+ data.form.job_type = props.associatedJobType+ }+ },++ changeJobType: (value: any) => {+ // Find the ID corresponding value+ const jobType = data.combobox.job_type.find((item) => item.value === value)+ if (jobType) {+ data.form.job_type = jobType.value+ }+ },++ openCommoditySelect: () => {+ // Open select modal after UI rendered.+ setTimeout(() => {+ data.showCommodityDialogSelect = true+ }, 100)+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ data.form.warehouse_name = selectRecords[0].warehouse+ data.form.location_name = selectRecords[0].location_name+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ } catch (error) {+ // console.error(error)+ }+ },++ clearCommodity: () => {+ data.form.sku_id = 0+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockAdjust(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')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vuenew file mode 100644index 0000000..6497654--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue@@ -0,0 +1,365 @@+<!-- Warehouse Adjust -->+<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">+ <!-- <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>+ </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.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseAdjust.job_code')"+ 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: '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="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.job_code')"></vxe-column>+ <vxe-column field="job_type" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.job_type')">+ <template #default="{ row, column }">+ <span>{{ formatAdjustJobType(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <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="qty" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.qty')"></vxe-column>+ <vxe-column field="warehouse_name" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.warehouse')"></vxe-column>+ <vxe-column field="location_name" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.location_name')"></vxe-column>+ <!-- <vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseAdjust.handler')"></vxe-column>+ <vxe-column+ field="handle_time"+ width="170px"+ :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="operate" :title="$t('system.page.operate')" width="200" :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>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseAdjust.confirmAdjust')"+ :disabled="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.confirmAdjustBtnDisabled(row)"+ @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>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :process-type="data.processType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch, nextTick, onActivated } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { WarehouseAdjustVO } from '@/types/WarehouseWorking/WarehouseAdjust'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+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 { 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'++const xTable = ref()++const data = reactive({+ showDialog: false,+ processType: PROCESS_JOB_COMBINE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseAdjustVO[]>([]),+ dialogForm: {+ id: 0,+ // job_type: AdjustJobType.TAKE,+ job_code: '',+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_update_stock: false,+ source_table_id: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ // job_type: AdjustJobType.TAKE,+ job_code: '',+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_update_stock: false,+ source_table_id: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockAdjustList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseAdjustVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockAdjustOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseAdjustVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockAdjust(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.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseAdjust'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'process_status' is false+ // confirmAdjustBtnDisabled: (row: WarehouseAdjustVO) => row.is_update_stock === true,++ confirmAdjust: async (row: WarehouseAdjustVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseAdjust.beforeConfirmAdjust'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmStockAdjust(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseAdjust.confirmAdjust') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ 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/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vuenew file mode 100644index 0000000..89c4060--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/add-or-update-freeze.vue@@ -0,0 +1,237 @@+<!-- Warehouse Freeze Operate Dialog -->+<template>+ <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-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.location_name"+ :label="$t('wms.warehouseWorking.warehouseFreeze.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.warehouse_name"+ :label="$t('wms.warehouseWorking.warehouseFreeze.warehouse')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ disabled+ ></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" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ :sql-title="commoditySqlTitle"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+ <!-- <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeLocationDialogSelect" @sureSelect="method.sureSelectLocation" /> -->+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { FREEZE_JOB_FREEZE, FREEZE_JOB_UNFREEZE } from '@/constant/warehouseWorking'+import { hookComponent } from '@/components/system/index'+import { addStockFreeze } from '@/api/wms/warehouseFreeze'+import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'+import { removeObjectNull } from '@/utils/common'+import commoditySelect from '@/components/select/commodity-select.vue'+import i18n from '@/languages/i18n'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseFreezeVO+ freezeType: boolean+}>()++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')))++// Unfreeze should be filter freezed.+const commoditySqlTitle = computed(() => (data.form.job_type === FREEZE_JOB_UNFREEZE ? 'frozen' : ''))++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseFreezeVO>({+ id: 0,+ job_code: '',+ job_type: FREEZE_JOB_FREEZE,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ handler: '',+ handle_time: '',+ last_update_time: '',+ tenant_id: 0,+ warehouse_name: '',+ location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ creator: '',+ create_time: ''+ }),+ rules: {+ warehouse_name: [],+ location_name: [],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ data.form.job_type = props.freezeType+ },++ openCommoditySelect: () => {+ // Open select modal after UI rendered.+ setTimeout(() => {+ data.showCommodityDialogSelect = true+ }, 100)+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ openLocationSelect: () => {+ setTimeout(() => {+ data.showLocationDialogSelect = true+ }, 100)+ },++ closeLocationDialogSelect: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code++ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ data.form.warehouse_name = selectRecords[0].warehouse_name+ data.form.location_name = selectRecords[0].location_name+ } catch (error) {+ console.error(error)+ }+ },++ clearCommodity: () => {+ data.form.sku_id = 0+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ },++ clearLocation: () => {+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockFreeze(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')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vuenew file mode 100644index 0000000..ccb6c28--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue@@ -0,0 +1,357 @@+<!-- 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">+ <tooltip-btn+ icon="mdi-lock-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseFreeze.freeze')"+ @click="method.add(FREEZE_JOB_FREEZE)"+ ></tooltip-btn>+ <tooltip-btn+ icon="mdi-lock-open-variant-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseFreeze.unfreeze')"+ @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>+ </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.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseFreeze.job_code')"+ 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: '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="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.job_code')"></vxe-column>+ <vxe-column field="job_type" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.job_type')">+ <template #default="{ row, column }">+ <span>{{ formatFreezeJobType(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="warehouse_name" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.warehouse')"></vxe-column>+ <vxe-column field="location_name" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.location_name')"></vxe-column>+ <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="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>+ <!-- <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseFreeze.creator')"></vxe-column>+ <vxe-column+ field="create_time"+ width="170px"+ :title="$t('wms.warehouseWorking.warehouseFreeze.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-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <!-- <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseMove.confirmMove')"+ @click="method.confirmMove(row)"+ ></tooltip-btn> -->+ <!-- <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>+ <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>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :freeze-type="data.freezeType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { WarehouseFreezeVO } from '@/types/WarehouseWorking/WarehouseFreeze'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { FREEZE_JOB_FREEZE, FREEZE_JOB_UNFREEZE } from '@/constant/warehouseWorking'+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 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'++const xTable = ref()++const data = reactive({+ showDialog: false,+ freezeType: FREEZE_JOB_FREEZE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseFreezeVO[]>([]),+ dialogForm: {+ id: 0,+ job_code: '',+ job_type: FREEZE_JOB_FREEZE,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ handler: '',+ handle_time: '',+ last_update_time: '',+ tenant_id: 0,+ warehouse_name: '',+ location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ creator: '',+ create_time: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: (jobType: boolean) => {+ data.freezeType = jobType+ data.dialogForm = {+ id: 0,+ job_code: '',+ job_type: FREEZE_JOB_FREEZE,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ handler: '',+ handle_time: '',+ last_update_time: '',+ tenant_id: 0,+ warehouse_name: '',+ location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ creator: '',+ create_time: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockFreezeList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseFreezeVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockFreezeOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ // deleteRow(row: WarehouseFreezeVO) {+ // hookComponent.$dialog({+ // content: i18n.global.t('system.tips.beforeDeleteMessage'),+ // handleConfirm: async () => {+ // if (row.id) {+ // const { data: res } = await deleteStockFreeze(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.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseFreeze'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ }+})++onActivated(() => {+ 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/warehouseWorking/warehouseMove/add-or-update-move.vue b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vuenew file mode 100644index 0000000..e861716--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue@@ -0,0 +1,311 @@+<!-- Warehouse Move Operate Dialog -->+<template>+ <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.warehouseMove')}`"></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-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" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+ <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeLocationDialogSelect" @sureSelect="method.sureSelectLocation" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addStockMove } from '@/api/wms/warehouseMove'+import { WarehouseMoveVO, MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'+import { removeObjectNull } from '@/utils/common'+import commoditySelect from '@/components/select/commodity-select.vue'+import locationSelect from '@/components/select/location-select.vue'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])+const isUpdate = computed(() => props.form.id && props.form.id > 0)+const operateDisabled = computed(() => !!isUpdate.value)++const props = defineProps<{+ showDialog: boolean+ form: WarehouseMoveVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ // Available Qty+ curAvailableQty: 0,++ form: ref<WarehouseMoveVO>({+ id: 0,+ job_code: '',+ move_status: MoveStatus.UNADJUST,+ sku_id: 0,+ orig_goods_location_id: 0,+ dest_googs_location_id: 0,+ qty: 0,+ goods_owner_id: 0,+ handler: '',+ handle_time: '',+ orig_goods_warehouse: '',+ orig_goods_location_name: '',+ dest_googs_warehouse: '',+ dest_googs_location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ creator: '',+ create_time: ''+ }),+ rules: {+ qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.qty') }!`,+ (val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero'),+ (val: string) => method.validQty(val)+ ],+ orig_goods_warehouse: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse') }!`+ ],+ orig_goods_location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.orig_goods_location_name') }!`+ ],+ dest_googs_warehouse: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse') }!`+ ],+ dest_googs_location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseMove.dest_googs_location_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],+ sku_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }!`]+ }+})++const method = reactive({+ // The 'qty' can't more than 'qty_available'+ validQty: (value: string): boolean | string => {+ let inputQty = Number(value)+ if (Number.isNaN(inputQty)) {+ inputQty = 0+ }++ if (inputQty > data.curAvailableQty) {+ return `${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qtyMoreThanAvailable') }${ data.curAvailableQty }`+ }+ return true+ },+ closeDialog: () => {+ emit('close')+ },+ initForm: () => {+ data.form = props.form+ },++ openCommoditySelect: () => {+ // Open select modal after UI rendered.+ setTimeout(() => {+ data.showCommodityDialogSelect = true+ }, 100)+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ openLocationSelect: () => {+ setTimeout(() => {+ data.showLocationDialogSelect = true+ }, 100)+ },++ closeLocationDialogSelect: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.orig_goods_location_id = selectRecords[0].goods_location_id+ data.form.orig_goods_warehouse = selectRecords[0].warehouse_name+ data.form.orig_goods_location_name = selectRecords[0].location_name+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ data.form.sku_name = selectRecords[0].sku_name++ data.curAvailableQty = selectRecords[0].qty_available+ } catch (error) {+ console.error(error)+ }+ },++ sureSelectLocation: (selectRecords: any) => {+ try {+ data.form.dest_googs_location_id = selectRecords[0].id+ data.form.dest_googs_warehouse = selectRecords[0].warehouse_name+ data.form.dest_googs_location_name = selectRecords[0].location_name+ } catch (error) {+ console.error(error)+ }+ },++ clearCommodity: () => {+ data.form.sku_id = 0+ data.form.orig_goods_location_id = 0+ data.form.orig_goods_warehouse = ''+ data.form.orig_goods_location_name = ''+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ data.form.sku_name = ''++ data.curAvailableQty = 0+ },++ clearLocation: () => {+ data.form.dest_googs_location_id = 0+ data.form.dest_googs_warehouse = ''+ data.form.dest_googs_location_name = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockMove(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')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vuenew file mode 100644index 0000000..e041a49--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue@@ -0,0 +1,397 @@+<!-- Warehouse Move -->+<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">+ <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>+ </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.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseMove.job_code')"+ 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: '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="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.job_code')"></vxe-column>+ <vxe-column field="move_status" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.move_status')">+ <template #default="{ row, column }">+ <span>{{ formatMoveStatus(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <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="sku_name" width="150px" :title="$t('base.commodityManagement.sku_name')"></vxe-column>+ <vxe-column field="qty" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.qty')"></vxe-column>+ <vxe-column+ field="orig_goods_warehouse"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.orig_goods_warehouse')"+ ></vxe-column>+ <vxe-column+ field="orig_goods_location_name"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.orig_goods_location_name')"+ ></vxe-column>+ <vxe-column+ field="dest_googs_warehouse"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.dest_googs_warehouse')"+ ></vxe-column>+ <vxe-column+ field="dest_googs_location_name"+ width="150px"+ :title="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"+ ></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>+ <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+ :flat="true"+ icon="mdi-eye-outline"+ :tooltip-text="$t('system.page.view')"+ @click="method.viewRow(row)"+ ></tooltip-btn>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-open-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseMove.confirmMove')"+ :disabled="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)"+ @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>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :process-type="data.processType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseMoveVO, MoveStatus } from '@/types/WarehouseWorking/WarehouseMove'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+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 { 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'++const xTable = ref()++const data = reactive({+ showDialog: false,+ processType: PROCESS_JOB_COMBINE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseMoveVO[]>([]),+ dialogForm: {+ id: 0,+ job_code: '',+ move_status: MoveStatus.UNADJUST,+ sku_id: 0,+ orig_goods_location_id: 0,+ dest_googs_location_id: 0,+ qty: 0,+ goods_owner_id: 0,+ handler: '',+ handle_time: '',+ orig_goods_warehouse: '',+ orig_goods_location_name: '',+ dest_googs_warehouse: '',+ dest_googs_location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ creator: '',+ create_time: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ job_code: '',+ move_status: MoveStatus.UNADJUST,+ sku_id: 0,+ orig_goods_location_id: 0,+ dest_googs_location_id: 0,+ qty: 0,+ goods_owner_id: 0,+ handler: '',+ handle_time: '',+ orig_goods_warehouse: '',+ orig_goods_location_name: '',+ dest_googs_warehouse: '',+ dest_googs_location_name: '',+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ creator: '',+ create_time: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockMoveList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseMoveVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockMoveOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseMoveVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockMove(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.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseMove'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'process_status' is false+ confirmMoveBtnDisabled: (row: WarehouseMoveVO) => row.move_status === MoveStatus.ADJUSTED,++ confirmMove: async (row: WarehouseMoveVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseMove.beforeConfirmMove'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmMove(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseMove.confirmMove') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ 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/warehouseWorking/warehouseProcessing/add-or-update-process.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vuenew file mode 100644index 0000000..734e47f--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue@@ -0,0 +1,584 @@+<template>+ <v-dialog v-model="isShow" width="80%" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="jobTypeComp"></v-toolbar>+ <v-card-text>+ <v-row>+ <!-- Source Table -->+ <v-col cols="6">+ <div class="dataTable">+ <div class="toolbar">+ <div class="toolbarTitle">+ <p style="color: #999">{{ $t('wms.warehouseWorking.warehouseProcessing.source') }}</p>+ </div>+ <tooltip-btn+ icon="mdi-plus"+ :tooltip-text="$t('system.page.add')"+ size="x-small"+ :disabled="operateDisabled"+ @click="method.openSelect('source')"+ ></tooltip-btn>+ </div>+ <vxe-table+ ref="xTableSource"+ :column-config="{ minWidth: '100px' }"+ :data="data.form.source_detail_list"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRulesSource"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="50" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRowSource(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <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="qty"+ :title="$t('wms.warehouseWorking.warehouseProcessing.qty')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="unit" :title="$t('wms.warehouseWorking.warehouseProcessing.unit')"></vxe-column>+ </vxe-table>+ </div>+ </v-col>++ <!-- Target Table -->+ <v-col cols="6">+ <div class="dataTable">+ <div class="toolbar">+ <div class="toolbarTitle">+ <p style="color: #999">{{ $t('wms.warehouseWorking.warehouseProcessing.target') }}</p>+ </div>+ <tooltip-btn+ icon="mdi-plus"+ :tooltip-text="$t('system.page.add')"+ size="x-small"+ :disabled="operateDisabled"+ @click="method.openSelect('target')"+ ></tooltip-btn>+ </div>+ <vxe-table+ ref="xTableTarget"+ :column-config="{ minWidth: '100px' }"+ :data="data.form.target_detail_list"+ :height="SYSTEM_HEIGHT.SELECT_TABLE"+ :edit-config="{ trigger: 'click', mode: 'cell' }"+ :edit-rules="data.validRulesTarget"+ align="center"+ >+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="operate" width="50" :title="$t('system.page.operate')" :resizable="false">+ <template #default="{ row }">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRowTarget(row)"+ ></tooltip-btn>+ </template>+ </vxe-column>+ <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="qty"+ :title="$t('wms.warehouseWorking.warehouseProcessing.qty')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.qty" type="text"></vxe-input>+ </template>+ </vxe-column>+ <vxe-column field="unit" width="60" :title="$t('wms.warehouseWorking.warehouseProcessing.unit')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.warehouseWorking.warehouseProcessing.target_location')" :edit-render="{}">+ <template #edit="{ row }">+ <vxe-input v-model="row.location_name" readonly type="search" @search-click="method.openLocationSelect(row)"></vxe-input>+ </template>+ </vxe-column>+ </vxe-table>+ </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" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select :show-dialog="data.showCommodityDialogSelect" @close="method.closeDialogSelect('source')" @sureSelect="method.sureSelect" />+ <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeLocationDialogSelect" @sureSelect="method.sureSelectLocation" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { VxeTablePropTypes } from 'vxe-table'+import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addStockProcess } from '@/api/wms/warehouseProcessing'+import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'+import { removeObjectNull } from '@/utils/common'+import { PROCESS_JOB_COMBINE, PROCESS_JOB_SPLIT } from '@/constant/warehouseWorking'+import commoditySelect from '@/components/select/commodity-select.vue'+import locationSelect from '@/components/select/location-select.vue'+import skuSelect from '@/components/select/sku-select.vue'+import tooltipBtn from '@/components/tooltip-btn.vue'+import { exportData } from '@/utils/exportTable'+import { isInteger } from '@/utils/dataVerification/tableRule'++const emit = defineEmits(['close', 'saveSuccess'])+const xTableSource = ref()+const xTableTarget = ref()++const props = defineProps<{+ showDialog: boolean+ form: WarehouseProcessingVO+ processType: boolean+}>()++const isShow = computed(() => props.showDialog)+const isUpdate = computed(() => props.form.id && props.form.id > 0)+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 method = reactive({+ initForm: () => {+ data.form = props.form+ data.form.job_type = props.processType+ },++ closeDialog: () => {+ emit('close')+ },++ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'source') {+ data.showCommodityDialogSelect = true+ } else if (type === 'target') {+ // Target should select the data with 'sku-select-modal'+ data.showSkuDialogSelect = true+ }+ },++ closeDialogSelect: (type: string) => {+ if (type === 'source') {+ data.showCommodityDialogSelect = false+ } else if (type === 'target') {+ // Target should select the data with 'sku-select-modal'+ data.showSkuDialogSelect = false+ }+ },++ sureSelect: (selectRecords: any) => {+ if (data.curSelectType === 'source') {+ method.insertSourceData(selectRecords)+ } else if (data.curSelectType === 'target') {+ method.insertTargetData(selectRecords)+ }+ },++ openLocationSelect: (row: WarehouseProcessingDetailVO) => {+ data.curSelectRow = row+ data.showLocationDialogSelect = true+ },++ closeLocationDialogSelect: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectLocation: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ const $table = xTableTarget.value+ const tableData = $table.getTableData().fullData+ tableData.forEach((row: WarehouseProcessingDetailVO) => {+ if (data.curSelectRow.sku_id === row.sku_id) {+ row.goods_location_id = selectRecords[0].id+ row.location_name = selectRecords[0].location_name+ }+ })+ // Tips: Must to reload!+ $table.reloadData(tableData)+ }+ },++ insertSourceData: (selectRecords: any) => {+ const $table = xTableSource.value+ const tableData = $table.getTableData().fullData++ // Combine: That can select more source commodity+ if (data.form.job_type === PROCESS_JOB_COMBINE) {+ for (const record of selectRecords) {+ const isRepeat = tableData.some((data: WarehouseProcessingDetailVO) => data.sku_id === record.sku_id)+ if (isRepeat) {+ continue+ }++ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: record.sku_id,+ goods_owner_id: record.goods_owner_id,+ goods_location_id: record.goods_location_id,+ qty: record.qty_available || 0,+ tenant_id: 0,+ is_source: true,+ spu_code: record.spu_code,+ spu_name: record.spu_name,+ sku_code: record.sku_code,+ unit: record.unit,+ is_update_stock: false,+ qty_available: record.qty_available+ },+ -1+ )+ // })+ }+ } else if (data.form.job_type === PROCESS_JOB_SPLIT) {+ // Split: That just can select one source commodity.+ // It should remove all data before insert.+ $table.remove()+ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: selectRecords[0].sku_id,+ goods_owner_id: selectRecords[0].goods_owner_id,+ goods_location_id: selectRecords[0].goods_location_id,+ qty: selectRecords[0].qty_available || 0,+ tenant_id: 0,+ is_source: true,+ spu_code: selectRecords[0].spu_code,+ spu_name: selectRecords[0].spu_name,+ sku_code: selectRecords[0].sku_code,+ unit: selectRecords[0].unit,+ is_update_stock: false,+ qty_available: selectRecords[0].qty_available+ },+ -1+ )+ }+ },++ insertTargetData: (selectRecords: any) => {+ const $table = xTableTarget.value+ const tableData = $table.getTableData().fullData++ // Combine: That just can select one target commodity+ if (data.form.job_type === PROCESS_JOB_COMBINE) {+ // It should remove all data before insert.+ $table.remove()+ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: selectRecords[0].sku_id,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ tenant_id: 0,+ is_source: false,+ spu_code: selectRecords[0].spu_code,+ spu_name: selectRecords[0].spu_name,+ sku_code: selectRecords[0].sku_code,+ unit: selectRecords[0].unit,+ is_update_stock: false+ },+ -1+ )+ } else if (data.form.job_type === PROCESS_JOB_SPLIT) {+ // Split: That can select more target commodity+ for (const record of selectRecords) {+ const isRepeat = tableData.some((data: WarehouseProcessingDetailVO) => data.sku_id === record.sku_id)+ if (isRepeat) {+ continue+ }+ $table.insertAt(+ {+ id: 0,+ stock_process_id: 0,+ sku_id: record.sku_id,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ tenant_id: 0,+ is_source: false,+ spu_code: record.spu_code,+ spu_name: record.spu_name,+ sku_code: record.sku_code,+ unit: record.unit,+ is_update_stock: false+ },+ -1+ )+ }+ }+ },++ // Export table+ exportTable: (type: string) => {+ const $table = type === 'source' ? xTableSource.value : xTableTarget.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.commodityManagement'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ submit: async () => {+ const validSource = await method.validSourceTable()+ const validTarget = await method.validTargetTable()+ if (!validSource || !validTarget) {+ return+ }++ const form = method.constructFormBody()++ const { data: res } = await addStockProcess(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')+ },++ constructFormBody: () => {+ const $tableSource = xTableSource.value+ const $tableTarget = xTableTarget.value++ const tableSourceRecords = $tableSource.getTableData().fullData+ const tableTargetRecords = $tableTarget.getTableData().fullData++ // Need combine source and target to server.+ let form = { ...data.form }+ form.detailList = [...tableSourceRecords, ...tableTargetRecords]+ form = removeObjectNull(form)++ delete form.source_detail_list+ delete form.target_detail_list++ return form+ },++ validSourceTable: async () => {+ const $table = xTableSource.value+ const tableData = $table.getTableData().fullData++ // 1.The table must have data.+ if (!tableData.length) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ return false+ }++ // 2.The properties valid.+ const errMap = await $table.validate()+ if (errMap) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ return false+ }++ return true+ },++ validTargetTable: async () => {+ const $table = xTableTarget.value+ const tableData = $table.getTableData().fullData++ // 1.The table must have data.+ if (!tableData.length) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.tips.detailLengthIsZero')+ })+ return false+ }++ // 2.The properties valid.+ const errMap = await $table.validate()+ if (errMap) {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ return false+ }++ return true+ },++ // The 'qty' can't more than 'qty_available'+ validQty: ({ cellValue, row }: any) => {+ const qty = cellValue || 0+ const qtyAvailable = row.qty_available || 0++ if (qty > qtyAvailable) {+ return new Error(`${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qtyMoreThanAvailable') } ${ qtyAvailable }`)+ }+ },++ deleteRowSource: (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTableSource.value+ $table.remove(row)+ }+ }+ })+ },++ deleteRowTarget: (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteDetailMessage'),+ handleConfirm: async () => {+ if (row) {+ const $table = xTableTarget.value+ $table.remove(row)+ }+ }+ })+ }+})++const data = reactive({+ tableData: [],+ // 'source' | 'target'+ curSelectType: '',++ showCommodityDialogSelect: false,+ showSkuDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseProcessingVO>({+ id: 0,+ job_code: '',+ job_type: PROCESS_JOB_COMBINE,+ process_status: false,+ processor: '',+ process_time: '',+ source_detail_list: [],+ target_detail_list: []+ }),+ curSelectRow: ref<WarehouseProcessingDetailVO>({+ id: 0,+ stock_process_id: 0,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ qty: 0,+ is_source: true,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ unit: '',+ is_update_stock: false+ }),+ validRulesSource: ref<any>({+ qty: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qty') }` },+ {+ validator: method.validQty+ },+ {+ validator: isInteger,+ validNumerical: 'greaterThanZero',+ trigger: 'change'+ }+ ]+ }),+ validRulesTarget: ref<any>({+ qty: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qty') }` },+ {+ validator: isInteger,+ validNumerical: 'greaterThanZero',+ trigger: 'change'+ }+ ],+ location_name: [+ {+ required: true,+ message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.target_location') }`+ }+ ]+ })+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.mainForm {+ background-color: #f9f9f9;+ border-radius: 5px;+ padding: 20px;+ box-sizing: border-box;+ overflow: auto;+}++.toolbar {+ height: 40px;+ display: flex;+ justify-content: space-between;+}++.toolbarTitle {+ display: flex;+ // justify-content: center;+ // align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vuenew file mode 100644index 0000000..94a87a1--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue@@ -0,0 +1,403 @@+<!-- Warehouse Processing -->+<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">+ <tooltip-btn+ icon="mdi-arrow-split-vertical"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.process_split')"+ @click="method.add(PROCESS_JOB_SPLIT)"+ ></tooltip-btn>+ <tooltip-btn+ icon="mdi-group"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.process_combine')"+ @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>+ </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.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseProcessing.job_code')"+ 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: '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="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseProcessing.job_code')"></vxe-column>+ <vxe-column field="job_type" :title="$t('wms.warehouseWorking.warehouseProcessing.job_type')">+ <template #default="{ row, column }">+ <span>{{ formatProcessJobType(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="adjust_status" :title="$t('wms.warehouseWorking.warehouseProcessing.adjust_status')">+ <template #default="{ row, column }">+ <span>{{ formatIsValid(row[column.property]) }}</span>+ </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>+ <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="operate" :title="$t('system.page.operate')" width="250" :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>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-check-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseProcessing.confirmProcess')"+ :disabled="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)"+ @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)"+ @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>+ <addOrUpdateDialog+ :show-dialog="data.showDialog"+ :form="data.dialogForm"+ :process-type="data.processType"+ @close="method.closeDialog"+ @saveSuccess="method.saveSuccess"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+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 { 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'++const xTable = ref()++const data = reactive({+ showDialog: false,+ processType: PROCESS_JOB_COMBINE,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ job_code: ''+ },+ tableData: ref<WarehouseProcessingVO[]>([]),+ dialogForm: {+ id: 0,+ job_code: '',+ job_type: PROCESS_JOB_COMBINE,+ process_status: false,+ processor: '',+ process_time: '',+ source_detail_list: ref<any[]>([]),+ target_detail_list: ref<any[]>([]),+ creator: '',+ create_time: '',+ adjust_status: false+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: (jobType: boolean) => {+ data.processType = jobType+ data.dialogForm = {+ id: 0,+ job_code: '',+ job_type: jobType,+ process_status: false,+ processor: '',+ process_time: '',+ source_detail_list: [],+ target_detail_list: [],+ creator: '',+ create_time: '',+ adjust_status: false+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockProcessList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseProcessingVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockProcessOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseProcessingVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockProcess(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.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseProcessing'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'process_status' is false+ confirmProcessBtnDisabled: (row: WarehouseProcessingVO) => !!row.process_status,++ // The btn will become disabled when the 'process_status' is false+ // or the 'adjust_status' is true+ confirmAdjustBtnDisabled: (row: WarehouseProcessingVO) => !row.process_status || !!row.adjust_status,++ confirmProcess: async (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseProcessing.beforeConfirmProcess'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmProcess(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.confirmProcess') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },++ confirmAdjust: async (row: WarehouseProcessingDetailVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseProcessing.beforeConfirmAdjust'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAdjustment(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.confirmAdjust') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ 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/warehouseWorking/warehouseTaking/add-or-update-taking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vuenew file mode 100644index 0000000..47c073c--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue@@ -0,0 +1,322 @@+<!-- Warehouse Taking Operate Dialog -->+<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.warehouseTaking')}`"></v-toolbar>+ <v-card-text>+ <div class="header">+ <div class="headerBtn">+ <tooltip-btn+ size="x-small"+ icon="mdi-home-plus-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseTaking.addFromStock')"+ @click="method.openCommoditySelect()"+ ></tooltip-btn>+ <tooltip-btn+ size="x-small"+ icon="mdi-store-plus-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseTaking.addFromCommodity')"+ :disabled="isFromStock"+ @click="method.openSkuSelect()"+ ></tooltip-btn>+ </div>+ <div class="headerTips">+ <v-tooltip :text="$t('wms.warehouseWorking.warehouseTaking.addTips')">+ <template #activator="{ props }">+ <v-btn v-bind="props" size="x-small" variant="text" icon="mdi-help-circle" color="blue-lighten-2"></v-btn>+ </template>+ </v-tooltip>+ </div>+ </div>+ <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: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.warehouse_name"+ :label="$t('wms.warehouseWorking.warehouseTaking.warehouse')"+ :rules="data.rules.warehouse_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.location_name"+ :label="$t('wms.warehouseWorking.warehouseTaking.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ :disabled="isFromStock"+ @click="method.openLocationSelect"+ @click:clear="method.clearLocation"+ ></v-text-field>+ <v-text-field+ v-model="data.form.book_qty"+ :label="$t('wms.warehouseWorking.warehouseTaking.book_qty')"+ :rules="data.rules.book_qty"+ variant="outlined"+ disabled+ ></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" :disabled="operateDisabled" @click="method.submit">{{ $t('system.page.submit') }}</v-btn>+ </v-card-actions>+ </v-card>+ </template>+ </v-dialog>++ <commodity-select+ :show-dialog="data.showCommodityDialogSelect"+ @close="method.closeCommodityDialogSelect"+ @sureSelect="method.sureSelectCommodity"+ />+ <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelectSku" @sureSelect="method.sureSelectSku" />+ <location-select :show-dialog="data.showLocationDialogSelect" @close="method.closeDialogSelectLocation" @sureSelect="method.sureSelectLocation" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { hookComponent } from '@/components/system/index'+import { addStockTaking } from '@/api/wms/warehouseTaking'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'+import { removeObjectNull } from '@/utils/common'+import { TAKING_JOB_FINISH } from '@/constant/warehouseWorking'+import i18n from '@/languages/i18n'+import commoditySelect from '@/components/select/commodity-select.vue'+import tooltipBtn from '@/components/tooltip-btn.vue'+import locationSelect from '@/components/select/location-select.vue'+import skuSelect from '@/components/select/sku-select.vue'++const formRef = ref()+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 props = defineProps<{+ showDialog: boolean+ form: WarehouseTakingVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,+ showSkuDialogSelect: false,++ // There has value when choose from stock.+ curStockID: 0,++ form: ref<WarehouseTakingVO>({+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ handler: '',+ handle_time: '',+ adjust_status: false,+ creator: '',+ create_time: ''+ }),+ rules: {+ job_type: [],+ book_qty: [],+ warehouse_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.warehouse') }!`+ ],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.location_name') }!`+ ],+ spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],+ spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],+ sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],+ sku_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_name') }!`]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },++ initForm: () => {+ data.form = props.form+ },++ openCommoditySelect: () => {+ data.showCommodityDialogSelect = true+ },++ closeCommodityDialogSelect: () => {+ data.showCommodityDialogSelect = false+ },++ sureSelectCommodity: (selectRecords: any) => {+ try {+ data.curStockID = selectRecords[0].id+ data.form.sku_id = selectRecords[0].sku_id+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ data.form.warehouse_name = selectRecords[0].warehouse_name+ data.form.location_name = selectRecords[0].location_name+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ data.form.book_qty = selectRecords[0].qty_available+ } catch (error) {+ // console.error(error)+ }+ },++ clearCommodity: () => {+ data.curStockID = 0+ data.form.sku_id = 0+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.sku_code = ''+ data.form.book_qty = 0+ },++ openSkuSelect: () => {+ data.showSkuDialogSelect = true+ },++ closeDialogSelectSku: () => {+ data.showSkuDialogSelect = false+ },++ sureSelectSku: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ data.form.sku_id = selectRecords[0].sku_id+ data.form.goods_owner_id = selectRecords[0].goods_owner_id+ data.form.goods_location_id = selectRecords[0].goods_location_id+ // The book qty should zero when the data from commodity.+ data.form.book_qty = 0+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_code = selectRecords[0].sku_code+ }+ },++ openLocationSelect: () => {+ data.showLocationDialogSelect = true+ },++ closeDialogSelectLocation: () => {+ data.showLocationDialogSelect = false+ },++ sureSelectLocation: (selectRecords: any) => {+ if (selectRecords.length > 0) {+ data.form.goods_location_id = selectRecords[0].id+ data.form.warehouse_name = selectRecords[0].warehouse_name+ data.form.location_name = selectRecords[0].location_name+ }+ },++ clearLocation: () => {+ data.form.goods_location_id = 0+ data.form.warehouse_name = ''+ data.form.location_name = ''+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await addStockTaking(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')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}++.header {+ display: flex;+ margin-bottom: 15px;+ justify-content: space-between;+}++.headerBtn {+}+.headerTips {+ display: flex;+ align-items: center;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vuenew file mode 100644index 0000000..df3e01c--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue@@ -0,0 +1,142 @@+<!-- Warehouse Taking Number Input -->+<template>+ <v-dialog v-model="isShow" :width="'20%'" transition="dialog-top-transition" :persistent="true">+ <template #default>+ <v-card>+ <v-toolbar color="white" :title="`${$t('router.sideBar.warehouseTaking')}`"></v-toolbar>+ <v-card-text>+ <p class="mb-4" style="color: #999999">{{ $t('wms.warehouseWorking.warehouseTaking.book_qty') }}:{{ data.form.book_qty }}</p>+ <v-form ref="formRef">+ <v-text-field+ v-model="data.form.counted_qty"+ :label="$t('wms.warehouseWorking.warehouseTaking.counted_qty')"+ :rules="data.rules.counted_qty"+ variant="outlined"+ clearable+ ></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 { hookComponent } from '@/components/system/index'+import { confirmStockTaking } from '@/api/wms/warehouseTaking'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'+import { removeObjectNull } from '@/utils/common'+import { TAKING_JOB_FINISH } from '@/constant/warehouseWorking'+import i18n from '@/languages/i18n'+import { IsInteger } from '@/utils/dataVerification/formRule'++const formRef = ref()+const emit = defineEmits(['close', 'saveSuccess'])++const props = defineProps<{+ showDialog: boolean+ form: WarehouseTakingVO+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ showCommodityDialogSelect: false,+ showLocationDialogSelect: false,++ form: ref<WarehouseTakingVO>({+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ adjust_status: false,+ handler: '',+ handle_time: ''+ }),+ rules: {+ book_qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.book_qty') }!`+ ],+ counted_qty: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.counted_qty') }!`,+ (val: number) => IsInteger(val, 'nonNegative') === '' || IsInteger(val, 'nonNegative')+ ]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },++ initForm: () => {+ data.form = props.form+ },++ submit: async () => {+ const { valid } = await formRef.value.validate()++ const form = method.constructFormBody()++ if (valid) {+ const { data: res } = await confirmStockTaking(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')+ })+ }+ },++ constructFormBody: () => {+ let form = { ...data.form }+ form = removeObjectNull(form)++ return form+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.initForm()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vuenew file mode 100644index 0000000..1059ed0--- /dev/null+++ b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue@@ -0,0 +1,407 @@+<!-- Warehouse Taking -->+<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">+ <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>+ </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.job_code"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.warehouseWorking.warehouseTaking.job_code')"+ 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: '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="job_code" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.job_code')"></vxe-column>+ <vxe-column field="job_status" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.job_status')">+ <template #default="{ row, column }">+ <span>{{ formatTakingJobStatus(row[column.property]) }}</span>+ </template>+ </vxe-column>+ <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="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>+ <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="operate" :title="$t('system.page.operate')" width="250" :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>+ <tooltip-btn+ :flat="true"+ icon="mdi-book-check-outline"+ :tooltip-text="$t('wms.warehouseWorking.warehouseTaking.confirmTaking')"+ :disabled="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)"+ @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)"+ @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>+ <addOrUpdateDialog :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <number-input+ :show-dialog="data.showDialogNumberInput"+ :form="data.dialogForm"+ @close="method.closeDialogNumberInput"+ @saveSuccess="method.saveSuccessNumberInput"+ />+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, onActivated, watch, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { WarehouseTakingVO } from '@/types/WarehouseWorking/WarehouseTaking'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+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 { 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'++const xTable = ref()++const data = reactive({+ showDialog: false,+ showDialogNumberInput: false,+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<WarehouseTakingVO[]>([]),+ dialogForm: ref<WarehouseTakingVO>({+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ handler: '',+ handle_time: '',+ adjust_status: false,+ creator: '',+ create_time: ''+ }),+ searchForm: {+ job_code: ''+ },+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ })+})++const method = reactive({+ // Open a dialog to add+ add: () => {+ data.dialogForm = {+ id: 0,+ job_code: '',+ job_status: TAKING_JOB_FINISH,+ sku_id: 0,+ goods_owner_id: 0,+ goods_location_id: 0,+ book_qty: 0,+ counted_qty: 0,+ difference_qty: 0,+ spu_code: '',+ spu_name: '',+ sku_code: '',+ warehouse_name: '',+ location_name: '',+ handler: '',+ handle_time: '',+ adjust_status: false,+ creator: '',+ create_time: ''+ }+ nextTick(() => {+ data.showDialog = true+ })+ },++ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },++ // After confirm taking.+ saveSuccessNumberInput: () => {+ method.refresh()+ method.closeDialogNumberInput()+ },++ // Refresh data+ refresh: () => {+ method.getStockProcessList()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ // Shut number input dialog+ closeDialogNumberInput: () => {+ data.showDialogNumberInput = false+ },++ getStockProcessList: async () => {+ const { data: res } = await getStockTakingList(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },++ viewRow: async (row: WarehouseTakingVO) => {+ await method.getOne(row.id)+ nextTick(() => {+ data.showDialog = true+ })+ },++ getOne: async (id: number) => {+ const { data: res } = await getStockTakingOne(id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }++ data.dialogForm = res.data+ },++ deleteRow(row: WarehouseTakingVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteStockTaking(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.refresh()+ }),++ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.warehouseTaking'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // The btn will become disabled when the 'job_status' is false+ confirmAdjustBtnDisabled: (row: WarehouseTakingVO) => row.job_status === TAKING_JOB_UNFINISH || !!row.adjust_status,++ // The btn will become disabled when the 'job_status' is true+ isConfirmTaking: (row: WarehouseTakingVO) => row.job_status === TAKING_JOB_FINISH,++ confirmTaking: async (row: WarehouseTakingVO) => {+ data.dialogForm = row+ nextTick(() => {+ data.showDialogNumberInput = true+ })+ },++ confirmAdjust: async (row: WarehouseTakingVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('wms.warehouseWorking.warehouseTaking.beforeConfirmAdjust'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAdjustment(row.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('wms.warehouseWorking.warehouseTaking.confirmAdjust') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ }+})++onActivated(() => {+ 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/wms/stockAsn/add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/add-or-update-notice.vuenew file mode 100644index 0000000..98e7295--- /dev/null+++ b/frontend/src/view/wms/stockAsn/add-or-update-notice.vue@@ -0,0 +1,280 @@+<template>+ <v-dialog v-model="isShow" :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-select+ v-model="data.form.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"+ ></v-select>+ <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+ @update:model-value="method.goodsOwnerNameChange"+ ></v-select>+ <v-text-field+ v-model="data.form.spu_code"+ :label="$t('wms.stockAsnInfo.spu_code')"+ :rules="data.rules.spu_code"+ variant="outlined"+ readonly+ clearable+ @click="method.openSelect('target')"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.form.spu_name"+ :label="$t('wms.stockAsnInfo.spu_name')"+ :rules="data.rules.spu_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_code"+ :label="$t('wms.stockAsnInfo.sku_code')"+ :rules="data.rules.sku_code"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.sku_name"+ :label="$t('wms.stockAsnInfo.sku_name')"+ :rules="data.rules.sku_name"+ variant="outlined"+ disabled+ ></v-text-field>+ <v-text-field+ v-model="data.form.asn_qty"+ :label="$t('wms.stockAsnInfo.asn_qty')"+ :rules="data.rules.asn_qty"+ variant="outlined"+ ></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>+ <sku-select :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { StockAsnVO } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { addAsn, updateAsn } from '@/api/wms/stockAsn'+import { getSupplierAll } from '@/api/base/supplier'+import { getOwnerOfCargoAll } from '@/api/base/ownerOfCargo'+import skuSelect from '@/components/select/sku-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(() => {+ if (props.form.id && props.form.id > 0) {+ return 'update'+ }+ return 'add'+})++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+ }),+ rules: {+ supplier_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.supplier_name') }!`],+ goods_owner_name: [],+ asn_qty: [],+ spu_code: [],+ spu_name: [],+ sku_code: [],+ sku_name: []+ },+ showSkuDialogSelect: false,+ curSelectType: '',+ combobox: ref<{+ supplier_name: {+ label: string+ value: number+ }[]+ goods_owner_name: {+ label: string+ value: number+ }[]+ }>({+ supplier_name: [],+ goods_owner_name: []+ })+})++const method = reactive({+ supplierNameChange: (val: string) => {+ if (!val) {+ data.form.supplier_id = 0+ } else {+ data.form.supplier_id = data.combobox.supplier_name.filter((item) => item.label === val)[0].value+ }+ },+ goodsOwnerNameChange: (val: string) => {+ if (!val) {+ data.form.goods_owner_id = 0+ } else {+ data.form.goods_owner_id = data.combobox.goods_owner_name.filter((item) => item.label === val)[0].value+ }+ },+ 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')+ },+ submit: async () => {+ const { valid } = await formRef.value.validate()+ if (valid) {+ const { data: res } = dialogTitle.value === 'add' ? await addAsn(data.form) : await updateAsn(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')+ })+ }+ },++ clearCommodity: () => {+ data.form.spu_id = 0+ data.form.spu_code = ''+ data.form.spu_name = ''+ data.form.spu_id = 0+ data.form.sku_code = ''+ data.form.sku_name = ''+ },+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ data.showSkuDialogSelect = false+ }+ },+ sureSelect: (selectRecords: any) => {+ if (data.curSelectType === 'target') {+ data.form.spu_id = selectRecords[0].spu_id+ data.form.spu_code = selectRecords[0].spu_code+ data.form.spu_name = selectRecords[0].spu_name+ data.form.sku_id = selectRecords[0].sku_id+ data.form.sku_code = selectRecords[0].sku_code+ data.form.sku_name = selectRecords[0].sku_name+ }+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ method.getCombobox()+ data.form = props.form+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockAsn/sku-info.vue b/frontend/src/view/wms/stockAsn/sku-info.vuenew file mode 100644index 0000000..29d50b0--- /dev/null+++ b/frontend/src/view/wms/stockAsn/sku-info.vue@@ -0,0 +1,139 @@+<template>+ <v-dialog v-model="isShow" :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-list-item two-line>+ <v-list-item-content>+ <v-list-item-title>{{ i18n.global.t('wms.skuInfo.spu_name') + ':' + data.tableData.spu_name }}</v-list-item-title>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_code') + ':' + data.tableData.sku_code }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_name') + ':' + data.tableData.sku_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.spu_description') + ':' + data.tableData.spu_description }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.category_name') + ':' + data.tableData.category_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.brand') + ':' + data.tableData.brand }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.origin') + ':' + data.tableData.origin }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.unit') + ':' + data.tableData.unit }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.cost') + ':' + data.tableData.cost }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.bar_code') + ':' + data.tableData.bar_code }}</v-list-item-subtitle>+ </v-list-item-content>+ </v-list-item>+ </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, computed, ref, watch } from 'vue'+import { StockAsnVO, SkuInfoVo } 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<{+ showDialog: boolean+ form: StockAsnVO+}>()++const isShow = computed(() => props.showDialog)++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+ }),+ tableData: ref<SkuInfoVo>({+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ weight: 0,+ lenght: 0,+ width: 0,+ height: 0,+ volume: 0,+ unit: '',+ cost: 0,+ price: 0+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ getStockAsnList: async () => {+ const { data: res } = await getSkuInfo(data.form.sku_id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.form = props.form+ method.getStockAsnList()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockAsn/stockAsn.vue b/frontend/src/view/wms/stockAsn/stockAsn.vuenew file mode 100644index 0000000..dc2007b--- /dev/null+++ b/frontend/src/view/wms/stockAsn/stockAsn.vue@@ -0,0 +1,158 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabNotice">+ <tabNotice ref="tabNoticeRef" />+ </v-window-item>+ <v-window-item value="tabToDoArrival">+ <tabToDoArrival ref="tabToDoArrivalRef" />+ </v-window-item>+ <v-window-item value="tabToDoUnload">+ <tabToDoUnload ref="tabToDoUnloadRef" />+ </v-window-item>+ <v-window-item value="tabToDoSorting">+ <tabToDoSorting ref="tabToDoSortingRef" />+ </v-window-item>+ <v-window-item value="tabToDoGrounding">+ <tabToDoGrounding ref="tabToDoGroundingRef" />+ </v-window-item>+ <v-window-item value="tabReceiptDetails">+ <tabReceiptDetails ref="tabReceiptDetailsRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabNotice from './tabNotice.vue'+import tabToDoArrival from './tabToDoArrival.vue'+import tabToDoUnload from './tabToDoUnload.vue'+import tabToDoSorting from './tabToDoSorting.vue'+import tabToDoGrounding from './tabToDoGrounding.vue'+import tabReceiptDetails from './tabReceiptDetails.vue'++const tabNoticeRef = ref()+const tabToDoArrivalRef = ref()+const tabToDoUnloadRef = ref()+const tabToDoSortingRef = ref()+const tabToDoGroundingRef = ref()+const tabReceiptDetailsRef = ref()++const tabsConfig = [+ {+ value: 'tabNotice',+ icon: 'mdi-checkbox-blank-badge',+ tabName: i18n.global.t('wms.stockAsn.tabNotice')+ },+ {+ value: 'tabToDoArrival',+ icon: 'mdi-truck-cargo-container',+ tabName: i18n.global.t('wms.stockAsn.tabToDoArrival')+ },+ {+ value: 'tabToDoUnload',+ icon: 'mdi-truck-outline',+ tabName: i18n.global.t('wms.stockAsn.tabToDoUnload')+ },+ {+ value: 'tabToDoSorting',+ icon: 'mdi-dolly',+ tabName: i18n.global.t('wms.stockAsn.tabToDoSorting')+ },+ {+ value: 'tabToDoGrounding',+ icon: 'mdi-grid',+ tabName: i18n.global.t('wms.stockAsn.tabToDoGrounding')+ },+ {+ value: 'tabReceiptDetails',+ icon: 'mdi-file-cabinet',+ tabName: i18n.global.t('wms.stockAsn.tabReceiptDetails')+ }+]++const data = reactive({+ activeTab: '',+ isLoadNotice: false,+ isLoadToDoArrival: false,+ isLoadToDoUnload: false,+ isLoadToDoSorting: false,+ isLoadToDoGrounding: false,+ isLoadReceiptDetails: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabNotice':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabNoticeRef?.value?.getStockAsnList) {+ tabNoticeRef.value.getStockAsnList()+ }+ break+ case 'tabToDoArrival':+ if (tabToDoArrivalRef?.value?.getStockAsnList) {+ tabToDoArrivalRef.value.getStockAsnList()+ }+ break+ case 'tabToDoUnload':+ if (tabToDoUnloadRef?.value?.getStockAsnList) {+ tabToDoUnloadRef.value.getStockAsnList()+ }+ break+ case 'tabToDoSorting':+ if (tabToDoSortingRef?.value?.getStockAsnList) {+ tabToDoSortingRef.value.getStockAsnList()+ }+ break+ case 'tabToDoGrounding':+ if (tabToDoGroundingRef?.value?.getStockAsnList) {+ tabToDoGroundingRef.value.getStockAsnList()+ }+ break+ case 'tabReceiptDetails':+ if (tabReceiptDetailsRef?.value?.getStockAsnList) {+ tabReceiptDetailsRef.value.getStockAsnList()+ }+ break+ }+ })+ }+})++onMounted(() => {})+</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/wms/stockAsn/tabNotice.vue b/frontend/src/view/wms/stockAsn/tabNotice.vuenew file mode 100644index 0000000..93c6ed8--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabNotice.vue@@ -0,0 +1,317 @@+<template>+ <div class="operateArea">+ <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-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>+ </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-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_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="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="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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <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" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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 tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import addOrUpdateNotice from './add-or-update-notice.vue'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ 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+ }),+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:0',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ // Open a dialog to add+ add: () => {+ 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+ }+ data.showDialog = true+ },+ editRow(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await deleteAsn(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()+ }+ }+ })+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // After add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // 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.tabNotice'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockAsn/tabReceiptDetails.vue b/frontend/src/view/wms/stockAsn/tabReceiptDetails.vuenew file mode 100644index 0000000..84cf1ac--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabReceiptDetails.vue@@ -0,0 +1,240 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_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="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-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>+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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 } 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'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ 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+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:4',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ 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()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockAsn/tabToDoArrival.vue b/frontend/src/view/wms/stockAsn/tabToDoArrival.vuenew file mode 100644index 0000000..a605d81--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoArrival.vue@@ -0,0 +1,262 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_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="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="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>+ </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>+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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, confirmAsn } 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'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ 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+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:0',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ editRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeAsnConfirm'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAsn(row.id)+ if (!res.isSuccess) {+ 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') }`+ })+ method.refresh()+ }+ }+ })+ },+ // 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.tabToDoArrival'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockAsn/tabToDoGrounding.vue b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vuenew file mode 100644index 0000000..6b4ab63--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue@@ -0,0 +1,286 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_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="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="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>+ <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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <updateGrounding :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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, sortedAsnCancel } 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'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ 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+ }),+ tableData: ref<StockAsnVO[]>([]),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:3',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ 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()+ },+ editRow(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await sortedAsnCancel(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()+ }+ }+ })+ },+ // 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.tabToDoGrounding'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockAsn/tabToDoSorting.vue b/frontend/src/view/wms/stockAsn/tabToDoSorting.vuenew file mode 100644index 0000000..ee92a6e--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoSorting.vue@@ -0,0 +1,308 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_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="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="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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <updateSorting :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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, sortedAsn, unloadAsnCancel } from '@/api/wms/stockAsn'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import updateSorting from './update-sorting.vue'+import customPager from '@/components/custom-pager.vue'+import skuInfo from './sku-info.vue'+import { exportData } from '@/utils/exportTable'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ 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+ }),+ tableData: ref<StockAsnVO[]>([]),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:2',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ 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()+ },+ editRowEdit(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialog = true+ },+ editRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeAsnSorted'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await sortedAsn(row.id)+ if (!res.isSuccess) {+ 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') }`+ })+ method.refresh()+ }+ }+ })+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await unloadAsnCancel(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()+ }+ }+ })+ },+ // 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.tabToDoSorting'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockAsn/tabToDoUnload.vue b/frontend/src/view/wms/stockAsn/tabToDoUnload.vuenew file mode 100644index 0000000..35c3db4--- /dev/null+++ b/frontend/src/view/wms/stockAsn/tabToDoUnload.vue@@ -0,0 +1,291 @@+<template>+ <div class="operateArea">+ <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>+ </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-text-field+ v-model="data.searchForm.supplier_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.supplier_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.sku_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockAsnInfo.sku_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="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="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-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @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>+ <skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } 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, unloadAsn, confirmAsnCancel } 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'++const xTableStockLocation = ref()++const data = reactive({+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ supplier_name: '',+ sku_name: ''+ },+ activeTab: null,+ tableData: ref<StockAsnVO[]>([]),+ 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+ }),+ tablePage: reactive({+ total: 0,+ sqlTitle: 'asn_status:1',+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockAsnVO) {+ data.dialogForm = JSON.parse(JSON.stringify(row))+ data.showDialogShowInfo = true+ },+ editRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeAsnUnload'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await unloadAsn(row.id)+ if (!res.isSuccess) {+ 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') }`+ })+ method.refresh()+ }+ }+ })+ },+ deleteRow(row: StockAsnVO) {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.id) {+ const { data: res } = await confirmAsnCancel(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()+ }+ }+ })+ },+ // 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+ $table.exportData({+ table: $table,+ filename: i18n.global.t('wms.stockAsn.tabToDoUnload'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockAsnList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockAsnList: method.getStockAsnList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockAsn/update-grounding.vue b/frontend/src/view/wms/stockAsn/update-grounding.vuenew file mode 100644index 0000000..da89fb6--- /dev/null+++ b/frontend/src/view/wms/stockAsn/update-grounding.vue@@ -0,0 +1,170 @@+<template>+ <v-dialog v-model="isShow" :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-model="data.formPutaway.location_name"+ :label="$t('base.warehouseSetting.location_name')"+ :rules="data.rules.location_name"+ variant="outlined"+ readonly+ clearable+ @click="method.openSelect('target')"+ @click:clear="method.clearCommodity"+ ></v-text-field>+ <v-text-field+ v-model="data.formPutaway.putaway_qty"+ :label="$t('wms.stockAsnInfo.actual_qty')"+ :rules="data.rules.putaway_qty"+ variant="outlined"+ ></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>+ <locationSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+</template>++<script lang="ts" setup>+import { reactive, computed, ref, watch } from 'vue'+import { StockAsnVO, PutawayVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { putawayAsn } 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 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+ }),+ rules: {+ putaway_qty: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.actual_qty') }!`],+ location_name: [+ (val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.location_name') }!`+ ]+ },+ showSkuDialogSelect: false,+ curSelectType: ''+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ 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')+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('system.checkText.checkFormFail')+ })+ }+ },++ clearCommodity: () => {+ data.formPutaway.goods_location_id = 0+ data.formPutaway.location_name = ''+ },+ openSelect: (type: string) => {+ data.curSelectType = type++ if (type === 'target') {+ data.showSkuDialogSelect = true+ }+ },+ closeDialogSelect: (type: string) => {+ if (type === 'target') {+ 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+ }+ }+})++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/wms/stockAsn/update-sorting.vue b/frontend/src/view/wms/stockAsn/update-sorting.vuenew file mode 100644index 0000000..a150a66--- /dev/null+++ b/frontend/src/view/wms/stockAsn/update-sorting.vue@@ -0,0 +1,129 @@+<template>+ <v-dialog v-model="isShow" :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-model="data.form.sorted_qty"+ :label="$t('wms.stockAsnInfo.sorted_qty')"+ :rules="data.rules.sorted_qty"+ variant="outlined"+ ></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 { StockAsnVO, SortingVo } from '@/types/WMS/StockAsn'+import i18n from '@/languages/i18n'+import { hookComponent } from '@/components/system/index'+import { sortingAsn } from '@/api/wms/stockAsn'++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 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') }!`]+ }+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ 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+ }+ 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/wms/stockManagement/sku-info.vue b/frontend/src/view/wms/stockManagement/sku-info.vuenew file mode 100644index 0000000..abaa0a8--- /dev/null+++ b/frontend/src/view/wms/stockManagement/sku-info.vue@@ -0,0 +1,112 @@+<template>+ <v-dialog v-model="isShow" :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-list-item two-line>+ <v-list-item-content>+ <v-list-item-title>{{ i18n.global.t('wms.skuInfo.spu_name') + ':' + data.tableData.spu_name }}</v-list-item-title>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_code') + ':' + data.tableData.sku_code }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.sku_name') + ':' + data.tableData.sku_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.spu_description') + ':' + data.tableData.spu_description }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.category_name') + ':' + data.tableData.category_name }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.brand') + ':' + data.tableData.brand }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.origin') + ':' + data.tableData.origin }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.unit') + ':' + data.tableData.unit }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.cost') + ':' + data.tableData.cost }}</v-list-item-subtitle>+ <v-list-item-subtitle>{{ i18n.global.t('wms.skuInfo.bar_code') + ':' + data.tableData.bar_code }}</v-list-item-subtitle>+ </v-list-item-content>+ </v-list-item>+ </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, computed, ref, watch } from 'vue'+import { SkuInfoVo } 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<{+ showDialog: boolean+ sku_id: number+}>()++const isShow = computed(() => props.showDialog)++const data = reactive({+ id: 0,+ tableData: ref<SkuInfoVo>({+ spu_id: 0,+ spu_code: '',+ spu_name: '',+ category_id: 0,+ category_name: '',+ spu_description: '',+ bar_code: '',+ supplier_id: 0,+ supplier_name: '',+ brand: '',+ origin: '',+ length_unit: 0,+ volume_unit: 0,+ weight_unit: 0,+ sku_id: 0,+ sku_code: '',+ sku_name: '',+ weight: 0,+ lenght: 0,+ width: 0,+ height: 0,+ volume: 0,+ unit: '',+ cost: 0,+ price: 0+ })+})++const method = reactive({+ closeDialog: () => {+ emit('close')+ },+ getStockAsnList: async () => {+ const { data: res } = await getSkuInfo(data.id)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data+ }+})++watch(+ () => isShow.value,+ (val) => {+ if (val) {+ data.id = props.sku_id+ method.getStockAsnList()+ }+ }+)+</script>++<style scoped lang="less">+.v-form {+ div {+ margin-bottom: 7px;+ }+}+</style>diff --git a/frontend/src/view/wms/stockManagement/stockManagement.vue b/frontend/src/view/wms/stockManagement/stockManagement.vuenew file mode 100644index 0000000..150d85c--- /dev/null+++ b/frontend/src/view/wms/stockManagement/stockManagement.vue@@ -0,0 +1,94 @@+<!-- Warehouse Setting -->+<template>+ <div class="container">+ <div>+ <v-tabs v-model="data.activeTab" stacked @update:model-value="method.changeTabs">+ <v-tab v-for="(item, index) of tabsConfig" :key="index" :value="item.value">+ <v-icon>{{ item.icon }}</v-icon>+ <p class="tabItemTitle">{{ item.tabName }}</p>+ </v-tab>+ </v-tabs>++ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item value="tabStockLocation">+ <tabStockLocation ref="tabStockLocationRef" />+ </v-window-item>+ <v-window-item value="tabStock">+ <tabStock ref="tabStockRef" />+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { ref, reactive, onMounted, watch, nextTick } from 'vue'+import i18n from '@/languages/i18n'+import tabStockLocation from './tabStockLocation.vue'+import tabStock from './tabStock.vue'++const tabStockLocationRef = ref()+const tabStockRef = ref()++const tabsConfig = [+ {+ value: 'tabStockLocation',+ icon: 'mdi-database',+ tabName: i18n.global.t('wms.stockManagement.stockLocation')+ },+ {+ value: 'tabStock',+ icon: 'mdi-warehouse',+ tabName: i18n.global.t('wms.stockManagement.stock')+ }+]++const data = reactive({+ activeTab: '',+ isLoadstockLocation: false,+ isLoadstock: false+})++const method = reactive({+ changeTabs: (e: any): void => {+ nextTick(() => {+ switch (e) {+ case 'tabStockLocation':+ // Tips:Must be write the nextTick so that can get DOM!!+ if (tabStockLocationRef?.value?.getStockLocationList) {+ tabStockLocationRef.value.getStockLocationList()+ }+ break+ case 'tabStock':+ if (tabStockRef?.value?.getStockList) {+ tabStockRef.value.getStockList()+ }+ break+ }+ })+ }+})++onMounted(() => { })+</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/wms/stockManagement/tabStock.vue b/frontend/src/view/wms/stockManagement/tabStock.vuenew file mode 100644index 0000000..aef93a5--- /dev/null+++ b/frontend/src/view/wms/stockManagement/tabStock.vue@@ -0,0 +1,215 @@+<template>+ <div class="operateArea">+ <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>+ </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="xTableWarehouse" :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="spu_code" :title="$t('wms.stockList.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockList.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockList.sku_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <vxe-column field="qty" :title="$t('wms.stockList.qty')"></vxe-column>+ <vxe-column field="qty_available" :title="$t('wms.stockList.qty_available')"></vxe-column>+ <vxe-column field="qty_locked" :title="$t('wms.stockList.qty_locked')"></vxe-column>+ <vxe-column field="qty_frozen" :title="$t('wms.stockList.qty_frozen')"></vxe-column>+ <vxe-column field="qty_asn" :title="$t('wms.stockList.qty_asn')"></vxe-column>+ <vxe-column field="qty_to_unload" :title="$t('wms.stockList.qty_to_unload')"></vxe-column>+ <vxe-column field="qty_to_sort" :title="$t('wms.stockList.qty_to_sort')"></vxe-column>+ <vxe-column field="qty_sorted" :title="$t('wms.stockList.qty_sorted')"></vxe-column>+ <vxe-column field="shortage_qty" :title="$t('wms.stockList.shortage_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>+ <skuInfo :show-dialog="data.showDialogShowInfo" :sku_id="data.sku_id" @close="method.closeDialogShowInfo" />+</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 { 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 { 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'++const xTableWarehouse = ref()++const data = reactive({+ sku_id: 0,+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ spu_name: ''+ },+ activeTab: null,+ tableData: ref<StockVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockVO) {+ data.sku_id = row.sku_id+ data.showDialogShowInfo = true+ },+ sumNum: (list: any[], field: string) => {+ let count = 0+ list.forEach((item) => {+ count += Number(item[field])+ })+ return count+ },+ // footerMethod:ref<VxeTablePropTypes.FooterMethod>({ columns, data }) => {+ // columns.map((column, columnIndex) => {+ // if (columnIndex === 0) {+ // return '合计'+ // }+ // if (['qty', 'qty_available'].includes(column.field)) {+ // return method.sumNum(data, column.field)+ // }+ // return null+ // })+ // },+ // Refresh data+ refresh: () => {+ method.getStockList()+ },+ getStockList: async () => {+ const { data: res } = await getStockList(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.getStockList()+ }),+ exportTable: () => {+ const $table = xTableWarehouse.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockManagement.stock'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockList: method.getStockList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/wms/stockManagement/tabStockLocation.vue b/frontend/src/view/wms/stockManagement/tabStockLocation.vuenew file mode 100644index 0000000..7ae3408--- /dev/null+++ b/frontend/src/view/wms/stockManagement/tabStockLocation.vue@@ -0,0 +1,195 @@+<template>+ <div class="operateArea">+ <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>+ </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.location_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.stockLocation.location_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="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="warehouse_name" :title="$t('wms.stockLocation.warehouse_name')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.stockLocation.location_name')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockLocation.spu_code')">+ <template #default="{ row }">+ <div :class="'text-decoration-none'" @click="method.showSkuInfo(row)"> {{ row.sku_code }}</div>+ </template>+ </vxe-column>+ <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="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>+ <vxe-column field="qty_frozen" :title="$t('wms.stockLocation.qty_frozen')"></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>+ <skuInfo :show-dialog="data.showDialogShowInfo" :sku_id="data.sku_id" @close="method.closeDialogShowInfo" />+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } 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 { 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'++const xTableStockLocation = ref()++const data = reactive({+ sku_id: 0,+ showDialog: false,+ showDialogShowInfo: false,+ searchForm: {+ location_name: ''+ },+ activeTab: null,+ tableData: ref<StockLocationVO[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ timer: ref<any>(null)+})++const method = reactive({+ closeDialogShowInfo: () => {+ data.showDialogShowInfo = false+ },+ showSkuInfo(row: StockLocationVO) {+ data.sku_id = row.sku_id+ data.showDialogShowInfo = true+ },+ // Refresh data+ refresh: () => {+ method.getStockLocationList()+ },+ getStockLocationList: async () => {+ const { data: res } = await getStockLocationList(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.getStockLocationList()+ }),+ exportTable: () => {+ const $table = xTableStockLocation.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.stockManagement.stockLocation'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getStockLocationList()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++defineExpose({+ getStockLocationList: method.getStockLocationList+})+watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style lang="less" scoped>+.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/yarn.lock b/frontend/yarn.lockindex 6c68d1b..faccf6c 100644--- a/frontend/yarn.lock+++ b/frontend/yarn.lock@@ -156,6 +156,31 @@resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz#6ec594468610c176933da1387c609558371d37e0"integrity sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==+"@fast-csv/[email protected]":+ version "4.3.5"+ resolved "https://registry.npmmirror.com/@fast-csv/format/-/format-4.3.5.tgz#90d83d1b47b6aaf67be70d6118f84f3e12ee1ff3"+ integrity sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==+ dependencies:+ "@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"++"@fast-csv/[email protected]":+ version "4.3.6"+ resolved "https://registry.npmmirror.com/@fast-csv/parse/-/parse-4.3.6.tgz#ee47d0640ca0291034c7aa94039a744cfb019264"+ integrity sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==+ dependencies:+ "@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"+"@iconify/types@^2.0.0":version "2.0.0"resolved "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"@@ -266,6 +291,11 @@resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==+"@types/node@^14.0.1":+ version "14.18.36"+ resolved "https://registry.npmmirror.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835"+ integrity sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==+"@types/node@^18.11.13":version "18.11.13"resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.13.tgz#dff34f226ec1ac0432ae3b136ec5552bd3b9c0fe"@@ -519,6 +549,11 @@ acorn@^8.8.0, acorn@^8.8.1:resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==+adler-32@~1.3.0:+ version "1.3.1"+ resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"+ integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==+ajv@^6.10.0, ajv@^6.10.2:version "6.12.6"resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"@@ -568,6 +603,35 @@ anymatch@~3.1.2:normalize-path "^3.0.0"picomatch "^2.0.4"+archiver-utils@^2.1.0:+ version "2.1.0"+ resolved "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"+ integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==+ dependencies:+ 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"++archiver@^5.0.0:+ version "5.3.1"+ resolved "https://registry.npmmirror.com/archiver/-/archiver-5.3.1.tgz#21e92811d6f09ecfce649fbefefe8c79e57cbbb6"+ integrity sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==+ dependencies:+ 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"+argparse@^1.0.7:version "1.0.10"resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"@@ -606,6 +670,11 @@ astral-regex@^1.0.0:resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==+async@^3.2.3:+ version "3.2.4"+ resolved "https://registry.npmmirror.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"+ integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==+asynckit@^0.4.0:version "0.4.0"resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"@@ -625,11 +694,43 @@ balanced-match@^1.0.0:resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==+base64-js@^1.3.1:+ version "1.5.1"+ resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"+ integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==++big-integer@^1.6.17:+ version "1.6.51"+ resolved "https://registry.npmmirror.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"+ integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==+binary-extensions@^2.0.0:version "2.2.0"resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==+binary@~0.3.0:+ version "0.3.0"+ resolved "https://registry.npmmirror.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"+ integrity sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==+ dependencies:+ buffers "~0.1.1"+ chainsaw "~0.1.0"++bl@^4.0.3:+ version "4.1.0"+ resolved "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"+ integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==+ dependencies:+ buffer "^5.5.0"+ inherits "^2.0.4"+ readable-stream "^3.4.0"++bluebird@~3.4.1:+ version "3.4.7"+ resolved "https://registry.npmmirror.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"+ integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==+brace-expansion@^1.1.7:version "1.1.11"resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"@@ -652,6 +753,29 @@ braces@^3.0.2, braces@~3.0.2:dependencies:fill-range "^7.0.1"+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:+ version "0.2.13"+ resolved "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"+ integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==++buffer-indexof-polyfill@~1.0.0:+ version "1.0.2"+ resolved "https://registry.npmmirror.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c"+ integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==++buffer@^5.5.0:+ version "5.7.1"+ resolved "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"+ integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==+ dependencies:+ base64-js "^1.3.1"+ ieee754 "^1.1.13"++buffers@~0.1.1:+ version "0.1.1"+ resolved "https://registry.npmmirror.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"+ integrity sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==+call-bind@^1.0.0, call-bind@^1.0.2:version "1.0.2"resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"@@ -665,6 +789,21 @@ callsites@^3.0.0:resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==+cfb@~1.2.1:+ version "1.2.2"+ resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"+ integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==+ dependencies:+ adler-32 "~1.3.0"+ crc-32 "~1.2.0"++chainsaw@~0.1.0:+ version "0.1.0"+ resolved "https://registry.npmmirror.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"+ integrity sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==+ dependencies:+ traverse ">=0.3.0 <0.4"+chalk@^2.0.0:version "2.4.2"resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"@@ -714,6 +853,11 @@ cli-width@^3.0.0:resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==+codepage@~1.15.0:+ version "1.15.0"+ resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"+ integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==+color-convert@^1.9.0:version "1.9.3"resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"@@ -745,6 +889,16 @@ combined-stream@^1.0.8:dependencies:delayed-stream "~1.0.0"+compress-commons@^4.1.0:+ version "4.1.1"+ resolved "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d"+ integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==+ dependencies:+ buffer-crc32 "^0.2.13"+ crc32-stream "^4.0.2"+ normalize-path "^3.0.0"+ readable-stream "^3.6.0"+version "0.0.1"resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"@@ -762,6 +916,24 @@ copy-anything@^2.0.1:dependencies:is-what "^3.14.1"+core-util-is@~1.0.0:+ version "1.0.3"+ resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==++crc-32@^1.2.0, crc-32@~1.2.0, crc-32@~1.2.1:+ version "1.2.2"+ resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"+ integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==++crc32-stream@^4.0.2:+ version "4.0.2"+ resolved "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007"+ integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==+ dependencies:+ crc-32 "^1.2.0"+ readable-stream "^3.4.0"+cross-spawn@^7.0.2, cross-spawn@^7.0.3:version "7.0.3"resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"@@ -776,6 +948,11 @@ csstype@^2.6.8:resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==+dayjs@^1.8.34:+ version "1.11.7"+ resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"+ integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==+de-indent@^1.0.2:version "1.0.2"resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"@@ -846,6 +1023,13 @@ doctrine@^3.0.0:dependencies:esutils "^2.0.2"+duplexer2@~0.1.4:+ version "0.1.4"+ resolved "https://registry.npmmirror.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"+ integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==+ dependencies:+ readable-stream "^2.0.2"+emoji-regex@^7.0.1:version "7.0.3"resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"@@ -856,6 +1040,13 @@ emoji-regex@^8.0.0:resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==+end-of-stream@^1.4.1:+ version "1.4.4"+ resolved "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==+ dependencies:+ once "^1.4.0"+errno@^0.1.1:version "0.1.8"resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"@@ -1154,6 +1345,21 @@ esutils@^2.0.2:resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==+exceljs@^4.3.0:+ version "4.3.0"+ resolved "https://registry.npmmirror.com/exceljs/-/exceljs-4.3.0.tgz#939bc0d4c59c200acadb7051be34d25c109853c4"+ integrity sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==+ dependencies:+ 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"+execa@^5.1.1:version "5.1.1"resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"@@ -1178,6 +1384,14 @@ external-editor@^3.0.3:iconv-lite "^0.4.24"tmp "^0.0.33"+fast-csv@^4.3.1:+ version "4.3.6"+ resolved "https://registry.npmmirror.com/fast-csv/-/fast-csv-4.3.6.tgz#70349bdd8fe4d66b1130d8c91820b64a21bc4a63"+ integrity sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==+ dependencies:+ "@fast-csv/format" "4.3.5"+ "@fast-csv/parse" "4.3.6"+fast-deep-equal@^3.1.1:version "3.1.3"resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"@@ -1273,6 +1487,16 @@ form-data@^4.0.0:combined-stream "^1.0.8"mime-types "^2.1.12"+frac@~1.1.2:+ version "1.1.2"+ resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"+ integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==++fs-constants@^1.0.0:+ version "1.0.0"+ resolved "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"+ integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==+fs.realpath@^1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"@@ -1283,6 +1507,16 @@ fsevents@~2.3.2:resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==+fstream@^1.0.12:+ version "1.0.12"+ resolved "https://registry.npmmirror.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"+ integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==+ dependencies:+ graceful-fs "^4.1.2"+ inherits "~2.0.0"+ mkdirp ">=0.5 0"+ rimraf "2"+function-bind@^1.1.1:version "1.1.1"resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"@@ -1337,7 +1571,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2:dependencies:is-glob "^4.0.1"-glob@^7.1.3:+glob@^7.1.3, glob@^7.1.4:version "7.2.3"resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==@@ -1375,7 +1609,7 @@ gopd@^1.0.1:dependencies:get-intrinsic "^1.1.3"-graceful-fs@^4.1.2:+graceful-fs@^4.1.2, graceful-fs@^4.2.0, graceful-fs@^4.2.2:version "4.2.10"resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==@@ -1445,6 +1679,11 @@ iconv-lite@^0.6.3:dependencies:safer-buffer ">= 2.1.2 < 3.0.0"+ieee754@^1.1.13:+ version "1.2.1"+ resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"+ integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==+ignore@^4.0.6:version "4.0.6"resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"@@ -1460,6 +1699,11 @@ image-size@~0.5.0:resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==+immediate@~3.0.5:+ version "3.0.6"+ resolved "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"+ integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==+import-fresh@^3.0.0:version "3.3.0"resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"@@ -1481,7 +1725,7 @@ inflight@^1.0.4:once "^1.3.0"wrappy "1"-inherits@2:+inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3:version "2.0.4"resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==@@ -1640,6 +1884,11 @@ is-what@^3.14.1:resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==+isarray@~1.0.0:+ version "1.0.0"+ resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"+ integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==+isexe@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"@@ -1680,6 +1929,16 @@ jsonc-parser@^3.2.0:resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==+jszip@^3.5.0:+ version "3.10.1"+ resolved "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"+ integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==+ dependencies:+ lie "~3.3.0"+ pako "~1.0.2"+ readable-stream "~2.3.6"+ setimmediate "^1.0.5"+klona@^2.0.4:version "2.0.5"resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"@@ -1690,6 +1949,13 @@ kolorist@^1.6.0:resolved "https://registry.npmjs.org/kolorist/-/kolorist-1.6.0.tgz#f43ac794305b30032a5bedcae7799d0f91d2ff36"integrity sha512-dLkz37Ab97HWMx9KTes3Tbi3D1ln9fCAy2zr2YVExJasDRPGRaKcoE4fycWNtnCAJfjFqe0cnY+f8KT2JePEXQ==+lazystream@^1.0.0:+ version "1.0.1"+ resolved "https://registry.npmmirror.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"+ integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==+ dependencies:+ readable-stream "^2.0.5"+less-loader@^11.1.0:version "11.1.0"resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.0.tgz#a452384259bdf8e4f6d5fdcc39543609e6313f82"@@ -1722,6 +1988,18 @@ levn@^0.4.1:prelude-ls "^1.2.1"type-check "~0.4.0"+lie@~3.3.0:+ version "3.3.0"+ resolved "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"+ integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==+ dependencies:+ immediate "~3.0.5"++listenercount@~1.0.1:+ version "1.0.1"+ resolved "https://registry.npmmirror.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"+ integrity sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==+local-pkg@^0.4.2:version "0.4.2"resolved "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.2.tgz#13107310b77e74a0e513147a131a2ba288176c2f"@@ -1734,11 +2012,81 @@ locate-path@^6.0.0:dependencies:p-locate "^5.0.0"+lodash.defaults@^4.2.0:+ version "4.2.0"+ resolved "https://registry.npmmirror.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"+ integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==++lodash.difference@^4.5.0:+ version "4.5.0"+ resolved "https://registry.npmmirror.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"+ integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==++lodash.escaperegexp@^4.1.2:+ version "4.1.2"+ resolved "https://registry.npmmirror.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"+ integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==++lodash.flatten@^4.4.0:+ version "4.4.0"+ resolved "https://registry.npmmirror.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"+ integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==++lodash.groupby@^4.6.0:+ version "4.6.0"+ resolved "https://registry.npmmirror.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"+ integrity sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==++lodash.isboolean@^3.0.3:+ version "3.0.3"+ resolved "https://registry.npmmirror.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"+ integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==++lodash.isequal@^4.5.0:+ version "4.5.0"+ resolved "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"+ integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==++lodash.isfunction@^3.0.9:+ version "3.0.9"+ resolved "https://registry.npmmirror.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"+ integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==++lodash.isnil@^4.0.0:+ version "4.0.0"+ resolved "https://registry.npmmirror.com/lodash.isnil/-/lodash.isnil-4.0.0.tgz#49e28cd559013458c814c5479d3c663a21bfaa6c"+ integrity sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==++lodash.isplainobject@^4.0.6:+ version "4.0.6"+ resolved "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"+ integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==++lodash.isundefined@^3.0.1:+ version "3.0.1"+ resolved "https://registry.npmmirror.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48"+ integrity sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==++lodash.union@^4.6.0:+ version "4.6.0"+ resolved "https://registry.npmmirror.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"+ integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==++lodash.uniq@^4.5.0:+ version "4.5.0"+ resolved "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"+ integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==+lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21:version "4.17.21"resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==+lottie-web@^5.10.1:+ version "5.10.1"+ resolved "https://registry.npmmirror.com/lottie-web/-/lottie-web-5.10.1.tgz#fde8e6be374afc3906f78b4152ada9be44ce3ccf"+ integrity sha512-u17bVNf/vA3oK9Wkyb1Vpo83WUIEQwaT0GeEN0qcvaExizyJ/RjmcbjSDj0CnwQCtpGqTgYhqprCC7cTWuXMNw==+lru-cache@^6.0.0:version "6.0.0"resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"@@ -1837,7 +2185,7 @@ mitt@^3.0.0:resolved "https://registry.npmmirror.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd"integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==-mkdirp@^0.5.1:+"mkdirp@>=0.5 0", mkdirp@^0.5.1:version "0.5.6"resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==@@ -1953,7 +2301,7 @@ object.values@^1.1.5:define-properties "^1.1.4"es-abstract "^1.20.4"-once@^1.3.0:+once@^1.3.0, once@^1.4.0:version "1.4.0"resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==@@ -1998,6 +2346,11 @@ p-locate@^5.0.0:dependencies:p-limit "^3.0.2"+pako@~1.0.2:+ version "1.0.11"+ resolved "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"+ integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==+parent-module@^1.0.0:version "1.0.1"resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"@@ -2078,6 +2431,11 @@ prelude-ls@^1.2.1:resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==+process-nextick-args@~2.0.0:+ version "2.0.1"+ resolved "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==+progress@^2.0.0:version "2.0.3"resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"@@ -2103,6 +2461,35 @@ queue-microtask@^1.2.2:resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.3.6:+ version "2.3.7"+ resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==+ dependencies:+ 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"++readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:+ version "3.6.0"+ resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"+ integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==+ dependencies:+ inherits "^2.0.3"+ string_decoder "^1.1.1"+ util-deprecate "^1.0.1"++readdir-glob@^1.0.0:+ version "1.1.2"+ resolved "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.2.tgz#b185789b8e6a43491635b6953295c5c5e3fd224c"+ integrity sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==+ dependencies:+ minimatch "^5.1.0"+readdirp@~3.6.0:version "3.6.0"resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"@@ -2151,6 +2538,13 @@ reusify@^1.0.4:resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==+rimraf@2:+ version "2.7.1"+ resolved "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"+ integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==+ dependencies:+ glob "^7.1.3"+version "2.6.3"resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"@@ -2158,6 +2552,13 @@ [email protected]:dependencies:glob "^7.1.3"+rimraf@^3.0.0:+ version "3.0.2"+ resolved "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==+ dependencies:+ glob "^7.1.3"+rollup@^3.7.0:version "3.7.3"resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.7.3.tgz#d440adff5f89099fd1f552e4e4333045e3bc71d4"@@ -2184,6 +2585,16 @@ rxjs@^6.6.0:dependencies:tslib "^1.9.0"+safe-buffer@~5.1.0, safe-buffer@~5.1.1:+ version "5.1.2"+ resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==++safe-buffer@~5.2.0:+ version "5.2.1"+ resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"+ integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==+safe-regex-test@^1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"@@ -2203,6 +2614,13 @@ sax@^1.2.4:resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==+saxes@^5.0.1:+ version "5.0.1"+ resolved "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"+ integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==+ dependencies:+ xmlchars "^2.2.0"+scule@^1.0.0:version "1.0.0"resolved "https://registry.npmjs.org/scule/-/scule-1.0.0.tgz#895e6f4ba887e78d8b9b4111e23ae84fef82376d"@@ -2225,6 +2643,11 @@ semver@^7.2.1, semver@^7.3.6, semver@^7.3.7:dependencies:lru-cache "^6.0.0"+setimmediate@^1.0.5, setimmediate@~1.0.4:+ version "1.0.5"+ resolved "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"+ integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==+shebang-command@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"@@ -2285,6 +2708,13 @@ sprintf-js@~1.0.2:resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==+ssf@~0.11.2:+ version "0.11.2"+ resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"+ integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==+ dependencies:+ frac "~1.1.2"+string-width@^3.0.0:version "3.1.0"resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"@@ -2321,6 +2751,20 @@ string.prototype.trimstart@^1.0.6:define-properties "^1.1.4"es-abstract "^1.20.4"+string_decoder@^1.1.1:+ version "1.3.0"+ resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"+ integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==+ dependencies:+ safe-buffer "~5.2.0"++string_decoder@~1.1.1:+ version "1.1.1"+ resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==+ dependencies:+ safe-buffer "~5.1.0"+strip-ansi@^5.1.0:version "5.2.0"resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"@@ -2386,6 +2830,17 @@ table@^5.2.3:slice-ansi "^2.1.0"string-width "^3.0.0"+tar-stream@^2.2.0:+ version "2.2.0"+ resolved "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"+ integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==+ dependencies:+ 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-table@^0.2.0:version "0.2.0"resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"@@ -2403,6 +2858,13 @@ tmp@^0.0.33:dependencies:os-tmpdir "~1.0.2"+tmp@^0.2.0:+ version "0.2.1"+ resolved "https://registry.npmmirror.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"+ integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==+ dependencies:+ rimraf "^3.0.0"+to-regex-range@^5.0.1:version "5.0.1"resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"@@ -2410,6 +2872,11 @@ to-regex-range@^5.0.1:dependencies:is-number "^7.0.0"+"traverse@>=0.3.0 <0.4":+ version "0.3.9"+ resolved "https://registry.npmmirror.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"+ integrity sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==+ts-md5@^1.3.1:version "1.3.1"resolved "https://registry.npmmirror.com/ts-md5/-/ts-md5-1.3.1.tgz#f5b860c0d5241dd9bb4e909dd73991166403f511"@@ -2547,6 +3014,22 @@ unplugin@^1.0.1:webpack-sources "^3.2.3"webpack-virtual-modules "^0.5.0"+unzipper@^0.10.11:+ version "0.10.11"+ resolved "https://registry.npmmirror.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e"+ integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==+ dependencies:+ 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"+uri-js@^4.2.2:version "4.4.1"resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"@@ -2554,6 +3037,16 @@ uri-js@^4.2.2:dependencies:punycode "^2.1.0"+util-deprecate@^1.0.1, util-deprecate@~1.0.1:+ version "1.0.2"+ resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"+ integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==++uuid@^8.3.0:+ version "8.3.2"+ resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"+ integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==+v8-compile-cache@^2.0.3:version "2.3.0"resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"@@ -2661,6 +3154,16 @@ vuex@^4.0.2:dependencies:"@vue/devtools-api" "^6.0.0-beta.11"+vxe-table-plugin-export-xlsx@^3.0.4:+ version "3.0.4"+ resolved "https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.0.4.tgz#35faabc0791b4e9aa516b78ea3fd45e67314afe4"+ integrity sha512-Og/NbXRIb+BS6sJ48oDNVrZnlkcpaCd/zS8JBAZjHLgioWr1Xoob6FEpaeXBebGPPgTumZNUrrBO57JhhYAerA==++vxe-table@^4.3.7:+ version "4.3.7"+ resolved "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.3.7.tgz#138c402b1681f077f9fd93c7dafa1cc974ac3af4"+ integrity sha512-v+d7eEQ5uqtVTQCts4xkW0S15LZcIuEukYHGXI53SdoUj2gLFggPYAxQr1y659CM/ESRWPz9LNVHpd97KkjGHw==+webpack-sources@^3.2.3:version "3.2.3"resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"@@ -2689,11 +3192,21 @@ which@^2.0.1:dependencies:isexe "^2.0.0"+wmf@~1.0.1:+ version "1.0.2"+ resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"+ integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==+word-wrap@^1.2.3:version "1.2.3"resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==+word@~0.3.0:+ version "0.3.0"+ resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"+ integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==+wrappy@1:version "1.0.2"resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"@@ -2706,6 +3219,29 @@ [email protected]:dependencies:mkdirp "^0.5.1"+xe-utils@^3.5.7:+ version "3.5.7"+ resolved "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.7.tgz#2c885852dfadd5c8beeffdc1f884f8ceb962c669"+ integrity sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==++xlsx@^0.18.5:+ version "0.18.5"+ resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"+ integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==+ dependencies:+ 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@^2.2.0:+ version "2.2.0"+ resolved "https://registry.npmmirror.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"+ integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==+yallist@^4.0.0:version "4.0.0"resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"@@ -2715,3 +3251,12 @@ yocto-queue@^0.1.0:version "0.1.0"resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==++zip-stream@^4.1.0:+ version "4.1.0"+ resolved "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"+ integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==+ dependencies:+ archiver-utils "^2.1.0"+ compress-commons "^4.1.0"+ readable-stream "^3.6.0"diff --git a/sqls/initSystemMenus.sql b/sqls/initSystemMenus.sqlnew file mode 100644index 0000000..9e0484e--- /dev/null+++ b/sqls/initSystemMenus.sql@@ -0,0 +1,21 @@+insert into menu(menu_name, module, vue_path, vue_directory, tenant_id, sort)+VALUES+('companySetting', 'baseModule', 'companySetting', 'base/companySetting', 1, 1),+('userRoleSetting', 'baseModule', 'userRoleSetting', 'base/userRoleSetting', 1, 2),+('roleMenu', 'baseModule', 'roleMenu', 'base/roleMenu', 1, 3),+('userManagement', 'baseModule', 'userManagement', 'base/userManagement', 1, 4),+('commodityCategorySetting', 'baseModule', 'commodityCategorySetting', 'base/commodityCategorySetting', 1, 5),+('commodityManagement', 'baseModule', 'commodityManagement', 'base/commodityManagement', 1, 6),+('supplier', 'baseModule', 'supplier', 'base/supplier', 1, 7),+('warehouseSetting', 'baseModule', 'warehouseSetting', 'base/warehouseSetting', 1, 8),+('ownerOfCargo', 'baseModule', 'ownerOfCargo', 'base/ownerOfCargo', 1, 9),+('freightSetting', 'baseModule', 'freightSetting', 'base/freightSetting', 1, 10),+('customer', 'baseModule', 'customer', 'base/customer', 1, 11),+('stockAsn', '', 'stockAsn', 'wms/stockAsn', 1, 2),+('stockManagement', '', 'stockManagement', 'wms/stockManagement', 1, 3),+('warehouseProcessing', 'warehouseWorkingModule', 'warehouseProcessing', 'warehouseWorking/warehouseProcessing', 1, 4),+('warehouseMove', 'warehouseWorkingModule', 'warehouseMove', 'warehouseWorking/warehouseMove', 1, 5),+('warehouseFreeze', 'warehouseWorkingModule', 'warehouseFreeze', 'warehouseWorking/warehouseFreeze', 1, 6),+('warehouseAdjust', 'warehouseWorkingModule', 'warehouseAdjust', 'warehouseWorking/warehouseAdjust', 1, 7),+('warehouseTaking', 'warehouseWorkingModule', 'warehouseTaking', 'warehouseWorking/warehouseTaking', 1, 8),+('deliveryManagement', '', 'deliveryManagement', 'deliveryManagement/deliveryManagement', 1, 5),\ No newline at end of file