fix: 🧩 修复关闭标签对应的关联无法清空

.env

@@ -1,5 +1,5 @@
 # title
-VITE_GLOB_APP_TITLE = OPS供应链系统
+VITE_GLOB_APP_TITLE = WMS系统
 
 # 本地运行端口号
 VITE_PORT = 8080

.env.development

@@ -1,14 +1,14 @@
-ENV = 'test'
+ENV = 'dev'
 VITE_APP_API_VERSION =""
 VITE_APP_API_BASEURL =  https://dev.wms.api.v2.f2b211.com/v1/admapi/
-VITE_APP_SSO_LOGINURL = http://dev.uc.v3.f2b211.com/uc/login # http://dev.uc.f2b211.com/index.php/uc/user/login.html
+VITE_APP_SSO_LOGINURL = https://dev.uc.v3.f2b211.com/uc/login # http://dev.uc.f2b211.com/index.php/uc/user/login.html
 VITE_APP_SSO_APPID = 101341644040699904
 
 VITE_REDIRECT_URL =http://localhost:8080/login #单点从定向地址
 VITE_SINGLE_URL = https://dev.uc.v3.f2b211.com/ #测试环境单点登录通知 
 
 # 测试环境
-VITE_USER_NODE_ENV = test
+VITE_USER_NODE_ENV = development
 
 # 公共基础路径
 VITE_PUBLIC_PATH = /

.env.production

@@ -1,10 +1,10 @@
 ENV = 'production'
 VITE_APP_API_VERSION = "" #版本号
-VITE_APP_API_BASEURL =  https://opsscmapi.f2b211.com/api/ #请求地址
+VITE_APP_API_BASEURL =  https://newwms.api.f2b211.com/v1/admapi/ #请求地址
-VITE_APP_SSO_LOGINURL = http://uc.v3.f2b211.com/uc/login
+VITE_APP_SSO_LOGINURL = https://uc.v3.f2b211.com/uc/login
-VITE_APP_SSO_APPID = 100664627590856707
+VITE_APP_SSO_APPID = 100664627590856709
 
-VITE_REDIRECT_URL = https://opsscm.f2b211.com/login  #单点从定向地址
+VITE_REDIRECT_URL = https://newwms.f2b211.com/login  #单点从定向地址
 VITE_SINGLE_URL = https://uc.v3.f2b211.com/ #单点登录通知 
 # 线上环境
 VITE_USER_NODE_ENV = production

.env.test

@@ -1,7 +1,7 @@
 ENV = 'test'
 VITE_APP_API_VERSION =""
-VITE_APP_API_BASEURL =  https://dev.wms.api.v2.f2b211.com/admapi/
+VITE_APP_API_BASEURL =  https://dev.wms.api.v2.f2b211.com/v1/admapi/
-VITE_APP_SSO_LOGINURL = http://dev.uc.v3.f2b211.com/uc/login # http://dev.uc.f2b211.com/index.php/uc/user/login.html
+VITE_APP_SSO_LOGINURL = https://dev.uc.v3.f2b211.com/uc/login # http://dev.uc.f2b211.com/index.php/uc/user/login.html
 VITE_APP_SSO_APPID = 101341644040699904
 
 VITE_REDIRECT_URL =https://dev.wms.v2.f2b211.com/login #单点从定向地址

.stylelintrc.cjs

@@ -22,7 +22,7 @@ module.exports = {
         "color-hex-length": "long", // 指定 16 进制颜色的简写或扩写 "short(16进制简写)"|"long(16进制扩写)"
         "rule-empty-line-before": "never", // 要求或禁止在规则之前的空行 "always(规则之前必须始终有一个空行)"|"never(规则前绝不能有空行)"|"always-multi-line(多行规则之前必须始终有一个空行)"|"never-multi-line(多行规则之前绝不能有空行)"
         "font-family-no-missing-generic-family-keyword": null, // 禁止在字体族名称列表中缺少通用字体族关键字
-    "scss/at-import-partial-extension": null, // 解决不能使用 @import 引入 scss 文件
+        "scss/at-import-partial-extension": null, // 解决不能使用 @use 引入 scss 文件
         "property-no-unknown": null, // 禁止未知的属性
         "no-empty-source": null, // 禁止空源码
         "selector-class-pattern": null, // 强制选择器类名的格式

package.json

@@ -21,7 +21,6 @@
     },
     "dependencies": {
         "@element-plus/icons-vue": "^2.1.0",
-        "@types/decimal.js": "^7.4.0",
         "@vueuse/core": "^10.1.2",
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
@@ -56,8 +55,10 @@
         "@commitlint/cli": "^17.6.3",
         "@commitlint/config-conventional": "^17.6.3",
         "@iconify-json/ep": "^1.1.10",
+        "@types/decimal.js": "^7.4.0",
         "@types/file-saver": "^2.0.5",
         "@types/js-md5": "^0.7.0",
+        "@types/lodash-es": "^4.17.12",
         "@types/nprogress": "^0.2.0",
         "@types/qs": "^6.9.7",
         "@types/sortablejs": "^1.15.1",
@@ -88,7 +89,7 @@
         "stylelint-config-recommended-vue": "^1.4.0",
         "stylelint-config-standard": "^33.0.0",
         "stylelint-config-standard-scss": "^9.0.0",
-        "typescript": "^5.0.2",
+        "typescript": "5.0.2",
         "unplugin-auto-import": "^0.16.4",
         "unplugin-icons": "^0.16.3",
         "unplugin-vue-components": "^0.25.1",

pnpm-lock.yaml

@@ -10,19 +10,16 @@ importers:
     dependencies:
       '@element-plus/icons-vue':
         specifier: ^2.1.0
-        version: 2.3.2(vue@3.5.21(typescript@5.9.2))
+        version: 2.3.2(vue@3.5.21(typescript@5.0.2))
-      '@types/decimal.js':
-        specifier: ^7.4.0
-        version: 7.4.3
       '@vueuse/core':
         specifier: ^10.1.2
-        version: 10.11.1(vue@3.5.21(typescript@5.9.2))
+        version: 10.11.1(vue@3.5.21(typescript@5.0.2))
       '@wangeditor/editor':
         specifier: ^5.1.23
         version: 5.1.23
       '@wangeditor/editor-for-vue':
         specifier: ^5.1.12
-        version: 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.21(typescript@5.9.2))
+        version: 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.21(typescript@5.0.2))
       async-validator:
         specifier: ^4.2.5
         version: 4.2.5
@@ -46,7 +43,7 @@ importers:
         version: 0.9.8
       element-plus:
         specifier: ^2.3.4
-        version: 2.11.2(vue@3.5.21(typescript@5.9.2))
+        version: 2.11.2(vue@3.5.21(typescript@5.0.2))
       file-saver:
         specifier: ^2.0.5
         version: 2.0.5
@@ -70,10 +67,10 @@ importers:
         version: 0.2.0
       pinia:
         specifier: ^2.1.3
-        version: 2.3.1(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+        version: 2.3.1(typescript@5.0.2)(vue@3.5.21(typescript@5.0.2))
       pinia-plugin-persistedstate:
         specifier: ^3.1.0
-        version: 3.2.3(pinia@2.3.1(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))
+        version: 3.2.3(pinia@2.3.1(typescript@5.0.2)(vue@3.5.21(typescript@5.0.2)))
       print-js:
         specifier: ^1.6.0
         version: 1.6.0
@@ -85,16 +82,16 @@ importers:
         version: 1.15.6
       vue:
         specifier: ^3.3.4
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.21(typescript@5.0.2)
       vue-router:
         specifier: ^4.2.2
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.21(typescript@5.0.2))
       vuedraggable:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.21(typescript@5.9.2))
+        version: 4.1.0(vue@3.5.21(typescript@5.0.2))
       vxe-table:
         specifier: ^4.5.0-beta.10
-        version: 4.16.12(vue@3.5.21(typescript@5.9.2))
+        version: 4.16.12(vue@3.5.21(typescript@5.0.2))
       xe-utils:
         specifier: ^3.5.11
         version: 3.7.9
@@ -111,12 +108,18 @@ importers:
       '@iconify-json/ep':
         specifier: ^1.1.10
         version: 1.2.3
+      '@types/decimal.js':
+        specifier: ^7.4.0
+        version: 7.4.3
       '@types/file-saver':
         specifier: ^2.0.5
         version: 2.0.7
       '@types/js-md5':
         specifier: ^0.7.0
         version: 0.7.2
+      '@types/lodash-es':
+        specifier: ^4.17.12
+        version: 4.17.12
       '@types/nprogress':
         specifier: ^0.2.0
         version: 0.2.3
@@ -128,16 +131,16 @@ importers:
         version: 1.15.8
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.59.7
-        version: 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.9.2))(eslint@8.57.1)(typescript@5.9.2)
+        version: 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.0.2))(eslint@8.57.1)(typescript@5.0.2)
       '@typescript-eslint/parser':
         specifier: ^5.59.7
-        version: 5.62.0(eslint@8.57.1)(typescript@5.9.2)
+        version: 5.62.0(eslint@8.57.1)(typescript@5.0.2)
       '@vitejs/plugin-vue':
         specifier: ^4.2.3
-        version: 4.6.2(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 4.6.2(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.0.2))
       '@vitejs/plugin-vue-jsx':
         specifier: ^3.0.1
-        version: 3.1.0(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 3.1.0(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.0.2))
       autoprefixer:
         specifier: ^10.4.14
         version: 10.4.21(postcss@8.5.6)
@@ -188,37 +191,37 @@ importers:
         version: 9.5.0
       stylelint:
         specifier: ^15.6.2
-        version: 15.11.0(typescript@5.9.2)
+        version: 15.11.0(typescript@5.0.2)
       stylelint-config-html:
         specifier: ^1.1.0
-        version: 1.1.0(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.9.2))
+        version: 1.1.0(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.0.2))
       stylelint-config-recess-order:
         specifier: ^4.0.0
-        version: 4.6.0(stylelint@15.11.0(typescript@5.9.2))
+        version: 4.6.0(stylelint@15.11.0(typescript@5.0.2))
       stylelint-config-recommended-scss:
         specifier: ^12.0.0
-        version: 12.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.9.2))
+        version: 12.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.0.2))
       stylelint-config-recommended-vue:
         specifier: ^1.4.0
-        version: 1.6.1(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.9.2))
+        version: 1.6.1(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.0.2))
       stylelint-config-standard:
         specifier: ^33.0.0
-        version: 33.0.0(stylelint@15.11.0(typescript@5.9.2))
+        version: 33.0.0(stylelint@15.11.0(typescript@5.0.2))
       stylelint-config-standard-scss:
         specifier: ^9.0.0
-        version: 9.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.9.2))
+        version: 9.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.0.2))
       typescript:
-        specifier: ^5.0.2
+        specifier: 5.0.2
-        version: 5.9.2
+        version: 5.0.2
       unplugin-auto-import:
         specifier: ^0.16.4
-        version: 0.16.7(@vueuse/core@10.11.1(vue@3.5.21(typescript@5.9.2)))(rollup@2.79.2)
+        version: 0.16.7(@vueuse/core@10.11.1(vue@3.5.21(typescript@5.0.2)))(rollup@2.79.2)
       unplugin-icons:
         specifier: ^0.16.3
         version: 0.16.6(@vue/compiler-sfc@3.5.21)(vue-template-compiler@2.7.16)
       unplugin-vue-components:
         specifier: ^0.25.1
-        version: 0.25.2(@babel/parser@7.28.4)(rollup@2.79.2)(vue@3.5.21(typescript@5.9.2))
+        version: 0.25.2(@babel/parser@7.28.4)(rollup@2.79.2)(vue@3.5.21(typescript@5.0.2))
       unplugin-vue-setup-extend-plus:
         specifier: ^1.0.0
         version: 1.0.1
@@ -242,7 +245,7 @@ importers:
         version: 2.0.1(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))
       vue-tsc:
         specifier: ^1.6.5
-        version: 1.8.27(typescript@5.9.2)
+        version: 1.8.27(typescript@5.0.2)
 
 packages:
 
@@ -4809,6 +4812,11 @@ packages:
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
+  typescript@5.0.2:
+    resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==}
+    engines: {node: '>=12.20'}
+    hasBin: true
+
   typescript@5.9.2:
     resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==}
     engines: {node: '>=14.17'}
@@ -6006,7 +6014,7 @@ snapshots:
       '@types/node': 20.5.1
       chalk: 4.1.2
       cosmiconfig: 8.3.6(typescript@5.9.2)
-      cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.9.2))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.9.2))(typescript@5.9.2)
+      cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.0.2))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.0.2))(typescript@5.9.2)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -6081,9 +6089,9 @@ snapshots:
 
   '@ctrl/tinycolor@3.6.1': {}
 
-  '@element-plus/icons-vue@2.3.2(vue@3.5.21(typescript@5.9.2))':
+  '@element-plus/icons-vue@2.3.2(vue@3.5.21(typescript@5.0.2))':
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
   '@esbuild/android-arm64@0.18.20':
     optional: true
@@ -6445,34 +6453,34 @@ snapshots:
 
   '@types/web-bluetooth@0.0.20': {}
 
-  '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.9.2))(eslint@8.57.1)(typescript@5.9.2)':
+  '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.0.2))(eslint@8.57.1)(typescript@5.0.2)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@5.9.2)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@5.0.2)
       '@typescript-eslint/scope-manager': 5.62.0
-      '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.1)(typescript@5.9.2)
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.1)(typescript@5.0.2)
-      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.9.2)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.0.2)
       debug: 4.4.3
       eslint: 8.57.1
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare-lite: 1.4.0
       semver: 7.7.2
-      tsutils: 3.21.0(typescript@5.9.2)
+      tsutils: 3.21.0(typescript@5.0.2)
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.9.2)':
+  '@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.0.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.9.2)
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.2)
       debug: 4.4.3
       eslint: 8.57.1
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -6481,21 +6489,21 @@ snapshots:
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/visitor-keys': 5.62.0
 
-  '@typescript-eslint/type-utils@5.62.0(eslint@8.57.1)(typescript@5.9.2)':
+  '@typescript-eslint/type-utils@5.62.0(eslint@8.57.1)(typescript@5.0.2)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.9.2)
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.2)
-      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.9.2)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.0.2)
       debug: 4.4.3
       eslint: 8.57.1
-      tsutils: 3.21.0(typescript@5.9.2)
+      tsutils: 3.21.0(typescript@5.0.2)
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@5.62.0': {}
 
-  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.9.2)':
+  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.0.2)':
     dependencies:
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/visitor-keys': 5.62.0
@@ -6503,20 +6511,20 @@ snapshots:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.7.2
-      tsutils: 3.21.0(typescript@5.9.2)
+      tsutils: 3.21.0(typescript@5.0.2)
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.9.2)':
+  '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.0.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@8.57.1)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.7.1
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.9.2)
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.2)
       eslint: 8.57.1
       eslint-scope: 5.1.1
       semver: 7.7.2
@@ -6560,20 +6568,20 @@ snapshots:
       '@uppy/utils': 4.1.3
       nanoid: 3.3.11
 
-  '@vitejs/plugin-vue-jsx@3.1.0(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue-jsx@3.1.0(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
       vite: 4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@4.6.2(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@4.6.2(vite@4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       vite: 4.5.14(@types/node@20.5.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
   '@volar/language-core@1.11.1':
     dependencies:
@@ -6649,7 +6657,7 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
-  '@vue/language-core@1.8.27(typescript@5.9.2)':
+  '@vue/language-core@1.8.27(typescript@5.0.2)':
     dependencies:
       '@volar/language-core': 1.11.1
       '@volar/source-map': 1.11.1
@@ -6661,7 +6669,7 @@ snapshots:
       path-browserify: 1.0.1
       vue-template-compiler: 2.7.16
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
 
   '@vue/reactivity@3.5.21':
     dependencies:
@@ -6679,30 +6687,30 @@ snapshots:
       '@vue/shared': 3.5.21
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.21(vue@3.5.21(typescript@5.9.2))':
+  '@vue/server-renderer@3.5.21(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       '@vue/compiler-ssr': 3.5.21
       '@vue/shared': 3.5.21
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
   '@vue/shared@3.5.21': {}
 
-  '@vueuse/core@10.11.1(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/core@10.11.1(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.11.1
-      '@vueuse/shared': 10.11.1(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/shared': 10.11.1(vue@3.5.21(typescript@5.0.2))
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@9.13.0(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/core@9.13.0(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.16
       '@vueuse/metadata': 9.13.0
-      '@vueuse/shared': 9.13.0(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/shared': 9.13.0(vue@3.5.21(typescript@5.0.2))
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -6711,24 +6719,24 @@ snapshots:
 
   '@vueuse/metadata@9.13.0': {}
 
-  '@vueuse/shared@10.11.1(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/shared@10.11.1(vue@3.5.21(typescript@5.0.2))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/shared@9.13.0(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/shared@9.13.0(vue@3.5.21(typescript@5.0.2))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vxe-ui/core@4.2.12(vue@3.5.21(typescript@5.9.2))':
+  '@vxe-ui/core@4.2.12(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       dom-zindex: 1.0.6
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
       xe-utils: 3.7.9
 
   '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.11)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.11)(slate@0.72.8)(snabbdom@3.6.2)':
@@ -6772,10 +6780,10 @@ snapshots:
       slate-history: 0.66.0(slate@0.72.8)
       snabbdom: 3.6.2
 
-  '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.21(typescript@5.9.2))':
+  '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.21(typescript@5.0.2))':
     dependencies:
       '@wangeditor/editor': 5.1.23
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
   '@wangeditor/editor@5.1.23':
     dependencies:
@@ -7404,13 +7412,22 @@ snapshots:
       object-assign: 4.1.1
       vary: 1.1.2
 
-  cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.9.2))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.9.2))(typescript@5.9.2):
+  cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.0.2))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.0.2))(typescript@5.9.2):
     dependencies:
       '@types/node': 20.5.1
       cosmiconfig: 8.3.6(typescript@5.9.2)
       ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.9.2)
       typescript: 5.9.2
 
+  cosmiconfig@8.3.6(typescript@5.0.2):
+    dependencies:
+      import-fresh: 3.3.1
+      js-yaml: 4.1.0
+      parse-json: 5.2.0
+      path-type: 4.0.0
+    optionalDependencies:
+      typescript: 5.0.2
+
   cosmiconfig@8.3.6(typescript@5.9.2):
     dependencies:
       import-fresh: 3.3.1
@@ -7668,15 +7685,15 @@ snapshots:
 
   electron-to-chromium@1.5.218: {}
 
-  element-plus@2.11.2(vue@3.5.21(typescript@5.9.2)):
+  element-plus@2.11.2(vue@3.5.21(typescript@5.0.2)):
     dependencies:
       '@ctrl/tinycolor': 3.6.1
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.21(typescript@5.9.2))
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.21(typescript@5.0.2))
       '@floating-ui/dom': 1.7.4
       '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
       '@types/lodash': 4.17.20
       '@types/lodash-es': 4.17.12
-      '@vueuse/core': 9.13.0(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/core': 9.13.0(vue@3.5.21(typescript@5.0.2))
       async-validator: 4.2.5
       dayjs: 1.11.18
       escape-html: 1.0.3
@@ -7685,7 +7702,7 @@ snapshots:
       lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21)
       memoize-one: 6.0.0
       normalize-wheel-es: 1.2.0
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -9258,17 +9275,17 @@ snapshots:
 
   pify@3.0.0: {}
 
-  pinia-plugin-persistedstate@3.2.3(pinia@2.3.1(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))):
+  pinia-plugin-persistedstate@3.2.3(pinia@2.3.1(typescript@5.0.2)(vue@3.5.21(typescript@5.0.2))):
     dependencies:
-      pinia: 2.3.1(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+      pinia: 2.3.1(typescript@5.0.2)(vue@3.5.21(typescript@5.0.2))
 
-  pinia@2.3.1(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)):
+  pinia@2.3.1(typescript@5.0.2)(vue@3.5.21(typescript@5.0.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.21(typescript@5.0.2))
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -9972,87 +9989,87 @@ snapshots:
 
   style-search@0.1.0: {}
 
-  stylelint-config-html@1.1.0(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-html@1.1.0(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       postcss-html: 1.8.0
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
 
-  stylelint-config-recess-order@4.6.0(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-recess-order@4.6.0(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
-      stylelint-order: 6.0.4(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-order: 6.0.4(stylelint@15.11.0(typescript@5.0.2))
 
-  stylelint-config-recommended-scss@11.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-recommended-scss@11.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       postcss-scss: 4.0.9(postcss@8.5.6)
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
-      stylelint-config-recommended: 12.0.0(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-recommended: 12.0.0(stylelint@15.11.0(typescript@5.0.2))
-      stylelint-scss: 4.7.0(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-scss: 4.7.0(stylelint@15.11.0(typescript@5.0.2))
     optionalDependencies:
       postcss: 8.5.6
 
-  stylelint-config-recommended-scss@12.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-recommended-scss@12.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       postcss-scss: 4.0.9(postcss@8.5.6)
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
-      stylelint-config-recommended: 12.0.0(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-recommended: 12.0.0(stylelint@15.11.0(typescript@5.0.2))
-      stylelint-scss: 5.3.2(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-scss: 5.3.2(stylelint@15.11.0(typescript@5.0.2))
     optionalDependencies:
       postcss: 8.5.6
 
-  stylelint-config-recommended-vue@1.6.1(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-recommended-vue@1.6.1(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       postcss-html: 1.8.0
       semver: 7.7.2
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
-      stylelint-config-html: 1.1.0(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-html: 1.1.0(postcss-html@1.8.0)(stylelint@15.11.0(typescript@5.0.2))
-      stylelint-config-recommended: 17.0.0(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-recommended: 17.0.0(stylelint@15.11.0(typescript@5.0.2))
 
-  stylelint-config-recommended@12.0.0(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-recommended@12.0.0(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
 
-  stylelint-config-recommended@17.0.0(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-recommended@17.0.0(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
 
-  stylelint-config-standard-scss@9.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-standard-scss@9.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
-      stylelint-config-recommended-scss: 11.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-recommended-scss: 11.0.0(postcss@8.5.6)(stylelint@15.11.0(typescript@5.0.2))
-      stylelint-config-standard: 33.0.0(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-standard: 33.0.0(stylelint@15.11.0(typescript@5.0.2))
     optionalDependencies:
       postcss: 8.5.6
 
-  stylelint-config-standard@33.0.0(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-config-standard@33.0.0(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
-      stylelint-config-recommended: 12.0.0(stylelint@15.11.0(typescript@5.9.2))
+      stylelint-config-recommended: 12.0.0(stylelint@15.11.0(typescript@5.0.2))
 
-  stylelint-order@6.0.4(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-order@6.0.4(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       postcss: 8.5.6
       postcss-sorting: 8.0.2(postcss@8.5.6)
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
 
-  stylelint-scss@4.7.0(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-scss@4.7.0(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       postcss-media-query-parser: 0.2.3
       postcss-resolve-nested-selector: 0.1.6
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
 
-  stylelint-scss@5.3.2(stylelint@15.11.0(typescript@5.9.2)):
+  stylelint-scss@5.3.2(stylelint@15.11.0(typescript@5.0.2)):
     dependencies:
       known-css-properties: 0.29.0
       postcss-media-query-parser: 0.2.3
       postcss-resolve-nested-selector: 0.1.6
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
-      stylelint: 15.11.0(typescript@5.9.2)
+      stylelint: 15.11.0(typescript@5.0.2)
 
-  stylelint@15.11.0(typescript@5.9.2):
+  stylelint@15.11.0(typescript@5.0.2):
     dependencies:
       '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
       '@csstools/css-tokenizer': 2.4.1
@@ -10060,7 +10077,7 @@ snapshots:
       '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.1.2)
       balanced-match: 2.0.0
       colord: 2.9.3
-      cosmiconfig: 8.3.6(typescript@5.9.2)
+      cosmiconfig: 8.3.6(typescript@5.0.2)
       css-functions-list: 3.2.3
       css-tree: 2.3.1
       debug: 4.4.3
@@ -10248,10 +10265,10 @@ snapshots:
 
   tslib@2.8.1: {}
 
-  tsutils@3.21.0(typescript@5.9.2):
+  tsutils@3.21.0(typescript@5.0.2):
     dependencies:
       tslib: 1.14.1
-      typescript: 5.9.2
+      typescript: 5.0.2
 
   type-check@0.4.0:
     dependencies:
@@ -10317,6 +10334,8 @@ snapshots:
 
   typedarray@0.0.6: {}
 
+  typescript@5.0.2: {}
+
   typescript@5.9.2: {}
 
   ufo@1.6.1: {}
@@ -10376,7 +10395,7 @@ snapshots:
 
   universalify@2.0.1: {}
 
-  unplugin-auto-import@0.16.7(@vueuse/core@10.11.1(vue@3.5.21(typescript@5.9.2)))(rollup@2.79.2):
+  unplugin-auto-import@0.16.7(@vueuse/core@10.11.1(vue@3.5.21(typescript@5.0.2)))(rollup@2.79.2):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.3.0(rollup@2.79.2)
@@ -10387,7 +10406,7 @@ snapshots:
       unimport: 3.14.6(rollup@2.79.2)
       unplugin: 1.16.1
     optionalDependencies:
-      '@vueuse/core': 10.11.1(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/core': 10.11.1(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - rollup
 
@@ -10406,7 +10425,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  unplugin-vue-components@0.25.2(@babel/parser@7.28.4)(rollup@2.79.2)(vue@3.5.21(typescript@5.9.2)):
+  unplugin-vue-components@0.25.2(@babel/parser@7.28.4)(rollup@2.79.2)(vue@3.5.21(typescript@5.0.2)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.3.0(rollup@2.79.2)
@@ -10418,7 +10437,7 @@ snapshots:
       minimatch: 9.0.5
       resolve: 1.22.10
       unplugin: 1.16.1
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
     optionalDependencies:
       '@babel/parser': 7.28.4
     transitivePeerDependencies:
@@ -10537,9 +10556,9 @@ snapshots:
       sass: 1.92.1
       terser: 5.44.0
 
-  vue-demi@0.14.10(vue@3.5.21(typescript@5.9.2)):
+  vue-demi@0.14.10(vue@3.5.21(typescript@5.0.2)):
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
   vue-eslint-parser@9.4.3(eslint@8.57.1):
     dependencies:
@@ -10554,47 +10573,47 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
+  vue-router@4.5.1(vue@3.5.21(typescript@5.0.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
   vue-template-compiler@2.7.16:
     dependencies:
       de-indent: 1.0.2
       he: 1.2.0
 
-  vue-tsc@1.8.27(typescript@5.9.2):
+  vue-tsc@1.8.27(typescript@5.0.2):
     dependencies:
       '@volar/typescript': 1.11.1
-      '@vue/language-core': 1.8.27(typescript@5.9.2)
+      '@vue/language-core': 1.8.27(typescript@5.0.2)
       semver: 7.7.2
-      typescript: 5.9.2
+      typescript: 5.0.2
 
-  vue@3.5.21(typescript@5.9.2):
+  vue@3.5.21(typescript@5.0.2):
     dependencies:
       '@vue/compiler-dom': 3.5.21
       '@vue/compiler-sfc': 3.5.21
       '@vue/runtime-dom': 3.5.21
-      '@vue/server-renderer': 3.5.21(vue@3.5.21(typescript@5.9.2))
+      '@vue/server-renderer': 3.5.21(vue@3.5.21(typescript@5.0.2))
       '@vue/shared': 3.5.21
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.0.2
 
-  vuedraggable@4.1.0(vue@3.5.21(typescript@5.9.2)):
+  vuedraggable@4.1.0(vue@3.5.21(typescript@5.0.2)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.21(typescript@5.0.2)
 
-  vxe-pc-ui@4.9.30(vue@3.5.21(typescript@5.9.2)):
+  vxe-pc-ui@4.9.30(vue@3.5.21(typescript@5.0.2)):
     dependencies:
-      '@vxe-ui/core': 4.2.12(vue@3.5.21(typescript@5.9.2))
+      '@vxe-ui/core': 4.2.12(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - vue
 
-  vxe-table@4.16.12(vue@3.5.21(typescript@5.9.2)):
+  vxe-table@4.16.12(vue@3.5.21(typescript@5.0.2)):
     dependencies:
-      vxe-pc-ui: 4.9.30(vue@3.5.21(typescript@5.9.2))
+      vxe-pc-ui: 4.9.30(vue@3.5.21(typescript@5.0.2))
     transitivePeerDependencies:
       - vue
 

src/api/index.ts

@@ -60,8 +60,17 @@ class RequestHttp {
         this.service.interceptors.response.use(
             (response: AxiosResponse) => {
                 const { data } = response;
-                // const userStore = useUserStore();
+
                 tryHideFullScreenLoading();
+                // 获取响应头中的 Authorization 信息
+                const authorization = response.headers["authorization"];
+                //刷新token
+                if (authorization) {
+                    // 可以在这里更新用户的 token 信息
+                    const userStore = useUserStore();
+                    userStore.setToken(authorization);
+                    return data;
+                }
                 // 登陆失效
                 if (data.code == 401) {
                     ElMessage.error(data.msg || data.message);

src/api/modules/antiCode.ts

@@ -1,25 +0,0 @@
-import http from "@/api";
-import { ResPage } from "@/api/interface/index";
-/**
- * @name 防伪码模块
- */
-//防伪码记录列表
-export const getListApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SecurityNumber/GetGenerateRecordList`, params);
-};
-//生成防伪码
-export const getGenerateSecurityNumberApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SecurityNumber/Generate`, params);
-};
-//防伪码下载列表 getDownListApi
-export const getDownListApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SecurityNumber/GetList`, params);
-};
-//下载
-export const getDownAllApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SecurityNumber/Export`, params);
-};
-//选择下载
-export const getDownApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SecurityNumber/Export`, params);
-};

src/api/modules/barCode.ts

@@ -1,110 +0,0 @@
-import http from "@/api";
-import { ResPage } from "@/api/interface/index";
-/**
- * @name 打印产品条码模块
- */
-//产品条码生成记录列表
-export const getListApi = (params: Record<string, any>) => {
-    // console.log(params);
-    // return {
-    //     isSuccess: true,
-    //     message: "Success",
-    //     status: 200,
-    //     totalCount: 1,
-    //     data: [
-    //         {
-    //             id: 17372,
-    //             specifications: "ORICO-H7013-U3-AD-EU-BK-BP",
-    //             materialNumber: "G01-43-552867",
-    //             materialName: "7口USB3.0集线器",
-    //             barCode: "6936761881968",
-    //             purchaseBillNo: "ceshi1224",
-    //             generateComplete: "已完成",
-    //             number: 300,
-    //             printNumber: 0,
-    //             downLoadNumber: 300,
-    //             useNumber: 2,
-    //             creator: "admin",
-    //             createTime: "2024-12-24 10:27:04",
-    //             generateCompleteTime: "2024-12-24 10:27:05",
-    //             supplierOrOrg: "深圳市元创时代科技有限公司",
-    //             isUpdateMaterial: false,
-    //             isTwo: 2
-    //         }
-    //     ]
-    // };
-    return http.post<ResPage<any>>(`SerialNumber/GetGenerateRecordList`, params);
-};
-//产品条码列表
-export const getCodeListApi = (params: Record<string, any>) => {
-    // console.log(params);
-    // return {
-    //     totalCount: 300,
-    //     data: [
-    //         {
-    //             materialNumber: "G01-43-552867",
-    //             materialName: "7口USB3.0集线器",
-    //             specifications: "ORICO-H7013-U3-AD-EU-BK-BP",
-    //             old_Specifications: "",
-    //             barCode: "6936761881968",
-    //             serialNumber: "10FC-616M3R",
-    //             twoSerialNumber: "10FC-616M3R-two",
-    //             numberCode: "241224000417",
-    //             id: 202593401,
-    //             number: 300,
-    //             isUse: false,
-    //             isUseStr: "否",
-    //             box: "",
-    //             creator: "admin",
-    //             createTime: "2024-12-24 10:27:05",
-    //             printNumber: 0,
-    //             downLoadNumber: 1,
-    //             printTime: "",
-    //             downLoadTime: "2025-01-08 16:11:39",
-    //             isEnablePrint: true
-    //         },
-    //         {
-    //             materialNumber: "G01-43-552867",
-    //             materialName: "7口USB3.0集线器",
-    //             specifications: "ORICO-H7013-U3-AD-EU-BK-BP",
-    //             old_Specifications: "",
-    //             barCode: "6936761881968",
-    //             serialNumber: "10FC-616M3Q",
-    //             twoSerialNumber: "10FC-616M3R-two",
-    //             numberCode: "241224000416",
-    //             id: 202593400,
-    //             number: 300,
-    //             isUse: false,
-    //             isUseStr: "否",
-    //             box: "",
-    //             creator: "admin",
-    //             createTime: "2024-12-24 10:27:05",
-    //             printNumber: 0,
-    //             downLoadNumber: 1,
-    //             printTime: "",
-    //             downLoadTime: "2025-01-08 16:11:39",
-    //             isEnablePrint: true
-    //         }
-    //     ],
-    //     isSuccess: true,
-    //     status: 200,
-    //     message: "Success"
-    // };
-    return http.post<ResPage<any>>(`SerialNumber/GetList`, params);
-};
-//转换规格型号 SerialNumber/UpdateMaterial
-export const getUpdateMaterialApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SerialNumber/UpdateMaterial`, params);
-};
-//产品条码列表下载
-export const getSerialNumberDownLoadApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SerialNumber/Export`, params);
-};
-//生成条码
-export const generateBarCodeApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SerialNumber/Generate`, params);
-};
-//打印
-export const getPrintListCodeApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`SerialNumber/Print`, params);
-};

src/api/modules/boxCode.ts

@@ -1,48 +0,0 @@
-import http from "@/api";
-import { ResPage } from "@/api/interface/index";
-//箱信息列表
-export const getListApi = (params: any) => {
-    return http.post<ResPage<any>>(`Box/GetList`, params);
-};
-//生成箱碼
-export const getBoxGenerateApi = (params: any) => {
-    return http.post<ResPage<any>>(`Box/Generate`, params);
-};
-//裝箱保存
-export const getSaveBoxApi = (params: any) => {
-    return http.post<ResPage<any>>(`Box/Save`, params, { noLoading: false });
-};
-//打印
-export const getPrintBoxApi = (params: any) => {
-    return http.post<ResPage<any>>(`Box/Print`, params);
-};
-//刪除 /
-export const getDeleteBoxApi = (params: any) => {
-    return http.post<ResPage<any>>(`Box/Delete`, params);
-};
-//清空
-export const getClearBoxApi = (params: any) => {
-    return http.get<ResPage<any>>(`Box/Clear`, params);
-};
-//根据箱号获取箱信息
-export const getBoxByNoApi = (params: any) => {
-    return http.get<ResPage<any>>(`Box/GetBoxByNo`, params, {
-        noLoading: true
-    });
-};
-//根据序列号获取序列号信息
-export const getSerialNumberApi = (params: any) => {
-    return http.get<ResPage<any>>(`SerialNumber/Get`, params);
-};
-//根据箱号去获取序列号
-export const getSerialNumberByBoxIdApi = (params: any) => {
-    return http.post<ResPage<any>>(`SerialNumber/GetByBoxId`, params, { noLoading: true });
-};
-//重新装箱
-export const getBoxRestartApi = (params: any) => {
-    return http.post<ResPage<any>>(`Box/Restart`, params);
-};
-//开始装箱时间接口 Box/BeginCarton
-export const getBeginCartonApi = (params: any) => {
-    return http.get<ResPage<any>>(`Box/BeginCarton`, params);
-};

src/api/modules/boxMark.ts

@@ -1,14 +0,0 @@
-//箱唛
-import http from "@/api";
-import { ResPage } from "@/api/interface/index";
-
-//箱唛列表
-export const getBoxMarkListApi = (params: Record<string, any>) => {
-    return http.post<ResPage<any>>(`BoxMark/GetList`, params);
-};
-//生成箱唛
-export const getMaterialListApi = (params: any) => {
-    console.log(params);
-    // return http.get<any>(`SysConfig/GetMaterialList?speci=${encodeURIComponent(speci)}`);
-    return [];
-};

src/api/modules/exportList.ts

@@ -1,6 +1,10 @@
 import http from "@/api";
 // 导出列表
 export const getListApi = (params: Record<string, any>) => {
+    if (params?.status === "正在导出") {
+        params.status = 0;
+    }
+
     return http.get<any>(`exports`, params);
 };
 //状态

src/api/modules/foundationMaterial.ts

@@ -6,5 +6,15 @@ import http from "@/api";
 
 //物料分页列表
 export const getMaterialListApi = (params: any) => {
+    if (params.disabled && params.disabled === "启用") {
+        params.disabled = 0;
+    }
     return http.get<any>(`material`, params);
 };
+//刷新 /admapi/material/reload
+export const getMaterialListReloadApi = (params: any) => {
+    return http.get<any>(`material/reload`, params);
+};
+export const getMaterialListExportApi = (params: any) => {
+    return http.get<any>(`material/export`, params);
+};

src/api/modules/global.ts

@@ -24,3 +24,8 @@ export const getUsersApi = (params: any) => {
 export const getProductLinesApi = (params: any) => {
     return http.get<any>(`basicinfo/productlines`, params);
 };
+
+//仓库
+export const getWarehousesListApi = () => {
+    return http.get<any>(`basicinfo/warehouses`);
+};

src/api/modules/login.ts

@@ -17,7 +17,6 @@ export const loginApi = (params: Login.ReqLoginCode) => {
 
 // 获取菜单列表
 export const getAuthMenuListApi = () => {
-    console.log("触发了吗");
     return http.get<any>(`/user/permissions`, {}, { noLoading: true });
     // return authMenuList;
 };

src/api/modules/setWarehouse.ts

@@ -0,0 +1,39 @@
+import http from "@/api";
+
+//列表
+export const getSetWarehouseListApi = (params: any) => {
+    return http.get<any>(`warehouse/relationship`, params);
+};
+
+//删除
+export const getWarehouseDelApi = (params: any) => {
+    return http.delete<any>(`warehouse/relationship/${params}`);
+};
+//新增 /admapi/warehouse/relationship
+export const getWarehouseAddApi = (params: any) => {
+    return http.post<any>(`warehouse/relationship`, params);
+};
+//更新
+export const getWarehouseUpApi = (id: any, params: any) => {
+    return http.post<any>(`warehouse/relationship/${id}`, params);
+};
+//详情
+export const getWarehouseDetailsApi = (id: any) => {
+    return http.get<any>(`warehouse/relationship/${id}`);
+};
+
+//获取金蝶仓库
+export const getSetWarehouseKingdeeListApi = (params: any) => {
+    return http.get<any>(`basicinfo/warehouses/kingdee`, params);
+};
+//获取金蝶子仓库
+export const getSetWarehouseSubwarehousesListApi = (params: any) => {
+    return http.get<any>(`basicinfo/subwarehouses/kingdee`, params);
+};
+//获取聚水潭仓库 /admapi/basicinfo/warehouses/jushuitan
+export const getSetWarehouseSubwarehousesJushuitanListApi = (params: any) => {
+    return http.get<any>(`basicinfo/warehouses/jushuitan`, params);
+};
+export const getSetWarehouseSubwarehousesLingXingListApi = (params: any) => {
+    return http.get<any>(`basicinfo/warehouses/lingxing`, params);
+};

src/api/modules/shop.ts

@@ -0,0 +1,30 @@
+import http from "@/api";
+
+//店鋪資料列表
+export const getShopListApi = (params: any) => {
+    return http.get<any>(`store`, params);
+};
+//獲取接入系統列表數據
+export const getShopAccessSystemApi = () => {
+    return http.get<any>(`store/access_system`);
+};
+//删除
+export const getShopDelApi = (params: any) => {
+    return http.delete<any>(`store/${params}`);
+};
+//新增
+export const getShopAddApi = (params: any) => {
+    return http.post<any>(`store`, params);
+};
+//更新
+export const getShopUpApi = (id: any, params: any) => {
+    return http.post<any>(`store/${id}`, params);
+};
+//详情
+export const getShopDetailsApi = (id: any) => {
+    return http.get<any>(`store/${id}`);
+};
+//导出
+export const getShopListExportApi = (params: any) => {
+    return http.get<any>(`store/export`, params);
+};

src/api/modules/warehousing.ts

@@ -0,0 +1,19 @@
+import http from "@/api";
+
+//订阅入庫單列表 /admapi/subscribe /admapi/subscribe/wrr
+export const getSubscribeWrrListApi = (params: any) => {
+    if (params?.notif_ret_status === "空") {
+        params.notif_ret_status = 0;
+    }
+    return http.get<any>(`subscribe/wrr`, params);
+};
+//订阅入库单刷新
+export const getSubscribeResetListApi = (params: any) => {
+    return http.get<any>(`subscribe/wrr/reload`, params);
+};
+export const getSubscribeResetListExportApi = (params: any) => {
+    if (params?.notif_ret_status === "空") {
+        params.notif_ret_status = 0;
+    }
+    return http.get<any>(`subscribe/wrr/export`, params);
+};

src/auto-import.d.ts

@@ -1,6 +1,7 @@
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
 export {}
 declare global {
@@ -37,6 +38,7 @@ declare global {
     const onServerPrefetch: typeof import("vue")["onServerPrefetch"];
     const onUnmounted: typeof import("vue")["onUnmounted"];
     const onUpdated: typeof import("vue")["onUpdated"];
+    const onWatcherCleanup: typeof import("vue")["onWatcherCleanup"];
     const provide: typeof import("vue")["provide"];
     const reactive: typeof import("vue")["reactive"];
     const readonly: typeof import("vue")["readonly"];
@@ -54,10 +56,13 @@ declare global {
     const useAttrs: typeof import("vue")["useAttrs"];
     const useCssModule: typeof import("vue")["useCssModule"];
     const useCssVars: typeof import("vue")["useCssVars"];
+    const useId: typeof import("vue")["useId"];
     const useLink: typeof import("vue-router")["useLink"];
+    const useModel: typeof import("vue")["useModel"];
     const useRoute: typeof import("vue-router")["useRoute"];
     const useRouter: typeof import("vue-router")["useRouter"];
     const useSlots: typeof import("vue")["useSlots"];
+    const useTemplateRef: typeof import("vue")["useTemplateRef"];
     const watch: typeof import("vue")["watch"];
     const watchEffect: typeof import("vue")["watchEffect"];
     const watchPostEffect: typeof import("vue")["watchPostEffect"];
@@ -66,5 +71,21 @@ declare global {
 // for type re-export
 declare global {
     // @ts-ignore
-    export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from "vue";
+    export type {
+        Component,
+        ComponentPublicInstance,
+        ComputedRef,
+        DirectiveBinding,
+        ExtractDefaultPropTypes,
+        ExtractPropTypes,
+        ExtractPublicPropTypes,
+        InjectionKey,
+        PropType,
+        Ref,
+        MaybeRef,
+        MaybeRefOrGetter,
+        VNode,
+        WritableComputedRef
+    } from "vue";
+    import("vue");
 }

src/components.d.ts

@@ -5,51 +5,65 @@
 // Read more: https://github.com/vuejs/core/pull/3399
 export {}
 
-declare module "vue" {
+declare module 'vue' {
   export interface GlobalComponents {
-        ElAside: typeof import("element-plus/es")["ElAside"];
+    403: typeof import('./components/ErrorMessage/403.vue')['default']
-        ElAutocomplete: typeof import("element-plus/es")["ElAutocomplete"];
+    404: typeof import('./components/ErrorMessage/404.vue')['default']
-        ElBreadcrumb: typeof import("element-plus/es")["ElBreadcrumb"];
+    500: typeof import('./components/ErrorMessage/500.vue')['default']
-        ElBreadcrumbItem: typeof import("element-plus/es")["ElBreadcrumbItem"];
+    ColSetting: typeof import('./components/ProTable/components/ColSetting.vue')['default']
-        ElButton: typeof import("element-plus/es")["ElButton"];
+    DetailsSearch: typeof import('./components/DetailsSearch/index.vue')['default']
-        ElCheckbox: typeof import("element-plus/es")["ElCheckbox"];
+    ElAside: typeof import('element-plus/es')['ElAside']
-        ElContainer: typeof import("element-plus/es")["ElContainer"];
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-        ElDatePicker: typeof import("element-plus/es")["ElDatePicker"];
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
-        ElDialog: typeof import("element-plus/es")["ElDialog"];
+    ElButton: typeof import('element-plus/es')['ElButton']
-        ElDrawer: typeof import("element-plus/es")["ElDrawer"];
+    ElContainer: typeof import('element-plus/es')['ElContainer']
-        ElDropdown: typeof import("element-plus/es")["ElDropdown"];
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-        ElDropdownItem: typeof import("element-plus/es")["ElDropdownItem"];
+    ElDialog: typeof import('element-plus/es')['ElDialog']
-        ElDropdownMenu: typeof import("element-plus/es")["ElDropdownMenu"];
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
-        ElForm: typeof import("element-plus/es")["ElForm"];
+    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-        ElFormItem: typeof import("element-plus/es")["ElFormItem"];
+    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-        ElHeader: typeof import("element-plus/es")["ElHeader"];
+    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-        ElIcon: typeof import("element-plus/es")["ElIcon"];
+    ElForm: typeof import('element-plus/es')['ElForm']
-        ElInput: typeof import("element-plus/es")["ElInput"];
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-        ElInputNumber: typeof import("element-plus/es")["ElInputNumber"];
+    ElHeader: typeof import('element-plus/es')['ElHeader']
-        ElMain: typeof import("element-plus/es")["ElMain"];
+    ElIcon: typeof import('element-plus/es')['ElIcon']
-        ElMenu: typeof import("element-plus/es")["ElMenu"];
+    ElInput: typeof import('element-plus/es')['ElInput']
-        ElMenuItem: typeof import("element-plus/es")["ElMenuItem"];
+    ElMain: typeof import('element-plus/es')['ElMain']
-        ElOption: typeof import("element-plus/es")["ElOption"];
+    ElMenu: typeof import('element-plus/es')['ElMenu']
-        ElPagination: typeof import("element-plus/es")["ElPagination"];
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-        ElScrollbar: typeof import("element-plus/es")["ElScrollbar"];
+    ElOption: typeof import('element-plus/es')['ElOption']
-        ElSelect: typeof import("element-plus/es")["ElSelect"];
+    ElPagination: typeof import('element-plus/es')['ElPagination']
-        ElSubMenu: typeof import("element-plus/es")["ElSubMenu"];
+    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-        ElSwitch: typeof import("element-plus/es")["ElSwitch"];
+    ElSelect: typeof import('element-plus/es')['ElSelect']
-        ElTable: typeof import("element-plus/es")["ElTable"];
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-        ElTableColumn: typeof import("element-plus/es")["ElTableColumn"];
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
-        ElTabPane: typeof import("element-plus/es")["ElTabPane"];
+    ElTable: typeof import('element-plus/es')['ElTable']
-        ElTabs: typeof import("element-plus/es")["ElTabs"];
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-        ElTag: typeof import("element-plus/es")["ElTag"];
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-        ElTooltip: typeof import("element-plus/es")["ElTooltip"];
+    ElTabs: typeof import('element-plus/es')['ElTabs']
-        IEpArrowDown: typeof import("~icons/ep/arrow-down")["default"];
+    ElTag: typeof import('element-plus/es')['ElTag']
-        IEpCircleClose: typeof import("~icons/ep/circle-close")["default"];
+    Empty: typeof import('./components/ProTable/components/Empty.vue')['default']
-        IEpFolderDelete: typeof import("~icons/ep/folder-delete")["default"];
+    Form: typeof import('./components/Form/index.vue')['default']
-        IEpFullScreen: typeof import("~icons/ep/full-screen")["default"];
+    FormItem: typeof import('./components/Form/components/FormItem.vue')['default']
-        IEpRefresh: typeof import("~icons/ep/refresh")["default"];
+    FormTable: typeof import('./components/FormTable/index.vue')['default']
-        IEpRemove: typeof import("~icons/ep/remove")["default"];
+    Grid: typeof import('./components/Grid/index.vue')['default']
-        IEpSearch: typeof import("~icons/ep/search")["default"];
+    GridItem: typeof import('./components/Grid/components/GridItem.vue')['default']
-        IEpSwitchButton: typeof import("~icons/ep/switch-button")["default"];
+    IEpArrowDown: typeof import('~icons/ep/arrow-down')['default']
-        RouterLink: typeof import("vue-router")["RouterLink"];
+    IEpCircleClose: typeof import('~icons/ep/circle-close')['default']
-        RouterView: typeof import("vue-router")["RouterView"];
+    IEpFolderDelete: typeof import('~icons/ep/folder-delete')['default']
+    IEpFullScreen: typeof import('~icons/ep/full-screen')['default']
+    IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpRemove: typeof import('~icons/ep/remove')['default']
+    IEpSwitchButton: typeof import('~icons/ep/switch-button')['default']
+    ImportExcel: typeof import('./components/ImportExcel/index.vue')['default']
+    Loading: typeof import('./components/Loading/index.vue')['default']
+    Pagination: typeof import('./components/ProTable/components/Pagination.vue')['default']
+    PermissionButton: typeof import('./components/PermissionButton/index.vue')['default']
+    ProTable: typeof import('./components/ProTable/index.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    SearchForm: typeof import('./components/SearchForm/index.vue')['default']
+    SearchFormItem: typeof import('./components/SearchForm/components/SearchFormItem.vue')['default']
+    TableColumn: typeof import('./components/ProTable/components/TableColumn.vue')['default']
   }
 }

src/components/DetailsSearch/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="search-box1" ref="searchRef">
+    <div :class="isSearch ? 'search-box' : 'search-box1'" ref="searchRef">
         <el-form
             ref="ruleFormRef"
             :model="_searchResult"
@@ -13,14 +13,14 @@
                     :label="item.label"
                     :prop="item.prop"
                     :label-width="labelWidth || '81px'"
-                    :rules="item.rules"
                     :error="item.error"
+                    :required="item.required"
                     :show-message="item.showMessage ? item.showMessage : false"
                     :inline-message="item.inlineMessage"
                     :style="item.style ? item.style : 'margin-right:8px;position: relative;'"
-                    :required="item.required"
                     :class="item.class ? item.class : 'form-item'"
                 >
+                    <!--   :required="item.required" -->
                     <template v-if="item.type === 'input'">
                         <el-input
                             v-model.trim="_searchResult[`${item.prop}`]"
@@ -31,6 +31,16 @@
                         >
                         </el-input>
                     </template>
+                    <template v-if="item.type === 'textarea'">
+                        <el-input
+                            v-model.trim="_searchResult[`${item.prop}`]"
+                            :placeholder="item.placeholder"
+                            :disabled="item.disabled"
+                            type="textarea"
+                            :maxlength="item.maxLength ? item.maxLength : 255"
+                        >
+                        </el-input>
+                    </template>
                     <template v-if="item.type === 'inputs'">
                         <el-input
                             v-model.trim="_searchResult[`${item.startProp}`]"
@@ -59,14 +69,30 @@
                             :disabled="item.disabled"
                         >
                             <el-option
-                                v-for="options in item.options"
+                                v-for="option in item.options"
-                                :label="options.label"
+                                :label="option.label"
-                                :value="options.value"
+                                :value="option.value"
-                                :key="options.label"
+                                :key="option.label"
+                            />
+                        </el-select>
+                    </template>
+                    <!-- 多选不带输入 -->
+                    <template v-if="item.type === 'selectMultiples'">
+                        <el-select
+                            v-model="_searchResult[`${item.prop}`]"
+                            :placeholder="item.placeholder"
+                            multiple
+                            :disabled="item.disabled"
+                            style="max-height: 150px; overflow-y: auto"
+                        >
+                            <el-option
+                                v-for="option in item.options"
+                                :label="option.label"
+                                :value="option.value"
+                                :key="option.label"
                             />
                         </el-select>
                     </template>
-
                     <template v-if="item.type === 'date'">
                         <el-date-picker
                             :disabled="item.disabled"
@@ -113,6 +139,7 @@
                             v-model="_searchResult[`${item.prop}`]"
                             multiple
                             filterable
+                            :reserve-keyword="false"
                             @remove-tag="handleRomoveTag(item)"
                             :disabled="item.disabled"
                             :placeholder="item.placeholder"
@@ -126,6 +153,27 @@
                             ></el-option>
                         </el-select>
                     </template>
+                    <!-- 单选带模糊搜索 -->
+                    <template v-if="item.type === 'selectMultipleD'">
+                        <el-select
+                            v-model="_searchResult[`${item.prop}`]"
+                            filterable
+                            :reserve-keyword="false"
+                            :disabled="item.disabled"
+                            :placeholder="item.placeholder"
+                            clearable
+                            @clear="handleSelectMultipleDClear(item)"
+                        >
+                            <!-- 循环渲染选项：label 为显示文本，value 为实际提交值 -->
+                            <el-option
+                                v-for="option in item.options"
+                                :key="option.value"
+                                :label="option.label"
+                                :value="option.value"
+                            ></el-option>
+                        </el-select>
+                    </template>
+                    <!-- 客户也是多选带模糊搜搜 -->
                     <template
                         v-if="item.type === 'selectMultipleRemoteCustomersNames' || item.type === 'selectProductLinesRemote'"
                     >
@@ -133,13 +181,14 @@
                             v-model="_searchResult[`${item.prop}`]"
                             :placeholder="item.placeholder"
                             remote
-                            multiple
                             filterable
+                            multiple
+                            :reserve-keyword="false"
+                            @remove-tag="handleTagRemove1(item)"
                             class="m-2 select"
-                            remote-show-suffix
-                            @clear="handleSelectClear(item.prop)"
                             :remote-method="(query:any)=> handleSelectMultipleRemote(query, item)"
                             :disabled="item.disabled"
+                            style="max-height: 300px; overflow-y: auto"
                         >
                             <el-option
                                 :label="option.label"
@@ -166,10 +215,13 @@ const props = defineProps<{
     labelWidth?: string;
     ruleForm: Record<string, any>;
     style?: string;
+    isSearch?: Boolean;
     inline?: Boolean;
     getSearchValue?: () => void;
     selectMultipleRemoveTag?: () => void;
+    selectMultipleRemoteTag1?: () => void;
     setRuleFormValue?: () => void;
+    selectMultipleDClear?: () => void;
 }>();
 
 let _searchResult = computed(() => {
@@ -181,11 +233,18 @@ const emits = defineEmits<{
     (e: "setMaterialList", result: Record<string, any>): void;
     (e: "setRuleFormValue", result: Record<string, any>): void;
     (e: "selectMultipleRemoveTag", result: Record<string, any>): void;
+    (e: "selectMultipleRemoteTag1", result: Record<string, any>): void;
+    (e: "selectMultipleDClear", result: Record<string, any>): void;
 }>();
 
 const handleRomoveTag = (item: any) => {
     emits("selectMultipleRemoveTag", { item, org_number: _searchResult.value.org_number });
 };
+const handleTagRemove1 = (item: any) => {
+    if (!_searchResult.value[item.prop].length) {
+        item.options = [];
+    }
+};
 
 //客戶
 const getCustomers = async (keywords: any, item: any) => {
@@ -197,11 +256,15 @@ const getCustomers = async (keywords: any, item: any) => {
             let options: any = [];
             data.forEach((item: any) => {
                 options.push({
-                    value: item.customer_number,
+                    value: item.customer_number + "_" + item.use_org_number,
-                    label: item.customer_name
+                    label: item.customer_name + " " + `(${item.use_org_name})`,
+                    id: item.use_org_number,
+                    useOrgName: item.use_org_name
                 });
             });
             item.options = options;
+        } else {
+            item.options = [];
         }
     }
 };
@@ -220,6 +283,8 @@ const getProductLines = async (keywords: any, item: any) => {
                 });
             });
             item.options = options;
+        } else {
+            item.options = [];
         }
     }
 };
@@ -234,19 +299,26 @@ const getUsers = async (keywords: any, item: any) => {
             data.forEach((item: any) => {
                 options.push({
                     value: item.dduid,
-                    label: item.realname
+                    label: item.realname + " " + item.mobile
                 });
             });
             item.options = options;
+        } else {
+            item.options = [];
         }
     }
 };
 
+const handleSelectMultipleDClear = (item: any) => {
+    emits("selectMultipleDClear", { item });
+};
+
 //远程搜索多选
 const handleSelectMultipleRemote = (query: any, item: any) => {
     if (!query) {
         return;
     }
+    item.options = [];
     let valClone = query.replace(/^\s*|\s*$/g, "");
     if (!valClone) {
         return;
@@ -271,9 +343,7 @@ const remoteMethod = async (query: any, item: any) => {
         getUsers(valClone, item);
     }
 };
-const handleSelectClear = (prop: any) => {
+
-    console.log("会触发吗?", prop);
-};
 //input输入验证
 const valueVerify = (item: any) => {
     //只能输入整数
@@ -303,9 +373,10 @@ const valueVerifyInputs = (item: any) => {
         prop: item.prop
     });
 };
-// const handleSelectMultipleClear = (item: any) => {
+
-//     console.log(item, "===========>");
+defineExpose({
-// };
+    formElement: ruleFormRef
+});
 </script>
 <style lang="scss" scope>
 .search-box1 {
@@ -362,6 +433,60 @@ const valueVerifyInputs = (item: any) => {
         margin-bottom: 8px !important;
     }
 }
+.search-box {
+    position: relative;
+    display: flex;
+    min-width: 600px;
+    padding: 16px;
+    background: #ffffff;
+    border-radius: 6px;
+
+    // 单据头用的样式
+    .form-box {
+        // width: 85%;
+        .form-item {
+            width: 392px !important;
+
+            // height: 32px;
+            // 原代码有 height: 32px !important; 这会导致子元素高度超出后被遮盖
+            height: auto !important; // 改为自动高度
+            min-height: 32px; // 保留最小高度，未选择时对齐
+            margin-bottom: 8px !important;
+            .el-form-item__label {
+                font-size: 12px !important;
+            }
+            .el-select {
+                width: 392px;
+            }
+            .el-form-item--default {
+                width: 392px;
+            }
+        }
+        .form-item1 {
+            width: 594px !important;
+
+            // height: 32px;
+            // 原代码有 height: 32px !important; 这会导致子元素高度超出后被遮盖
+            height: auto !important; // 改为自动高度
+            min-height: 32px; // 保留最小高度，未选择时对齐
+            margin-bottom: 8px !important;
+            .el-form-item__label {
+                font-size: 12px !important;
+            }
+            .el-select {
+                width: 594px;
+            }
+            .el-form-item--default {
+                width: 594px;
+            }
+        }
+        .form-item2 {
+            width: 494px !important;
+        }
+
+        margin-bottom: 8px !important;
+    }
+}
 .el-form-item--default .el-form-item__label {
     height: 32px;
     margin-bottom: 8px;

src/components/ErrorMessage/403.vue

@@ -16,5 +16,5 @@ const router = useRouter();
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/components/ErrorMessage/404.vue

@@ -16,5 +16,5 @@ const router = useRouter();
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/components/ErrorMessage/500.vue

@@ -16,5 +16,5 @@ const router = useRouter();
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/components/Form/components/FormItem.vue

@@ -119,5 +119,5 @@ const resetForm = (formEl: FormInstance | undefined) => {
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/components/Form/index.vue

@@ -83,5 +83,5 @@ const resetForm = (formEl: FormInstance | undefined) => {
 </script>
 
 <style scoped lang="scss">
-// @import "./index.scss";
+// @use "./index.scss";
 </style>

src/components/FormTable/index.vue

@@ -99,7 +99,7 @@ import { ElTable, ElTableColumn } from "element-plus";
 import { QuestionFilled } from "@element-plus/icons-vue";
 const props = defineProps<{
     columns: any;
-    rowStyle?: (params: any) => void;
+    rowStyle?: any;
     isStatus?: boolean;
     tableData?: any;
     height?: number;
@@ -150,7 +150,6 @@ const handleRemoteClick = (item: any, index: number) => {
     emits("handleRemoteClickValue", { item, index });
 };
 const handleEnterInput = (item: any, index: number) => {
-    console.log("1232323");
     emits("handleKeyupEnterInputValue", {
         item,
         index

src/components/ImportExcel/index.vue

@@ -147,5 +147,5 @@ defineExpose({
 });
 </script>
 <style lang="scss" scoped>
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/components/Loading/index.vue

@@ -9,5 +9,5 @@
 <script setup lang="ts" name="Loading"></script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/components/ProTable/index.vue

@@ -135,7 +135,7 @@ const props = withDefaults(defineProps<ProTableProps>(), {
     toolButton: true,
     // rowKey: `id${index}`,
     // searchCol: () => ({ xs: 1, sm: 2, md: 2, lg: 3, xl: 4 }),
-    sizes: [1, 2, 3, 4]
+    sizes: [50, 100, 150, 200]
 });
 
 // 是否显示搜索模块
@@ -147,7 +147,7 @@ const newValInitParams = toRef(props, "initParam");
 const { selectionChange, selectedList, selectedListIds, isSelected } = useSelection(props.rowKey);
 
 // 清空选中数据列表
-const clearSelection = () => tableRef.value!.clearSelection();
+const clearSelection = () => tableRef?.value!.clearSelection();
 // 表格操作 Hooks
 const { tableData, pageable, getTableList, handleSizeChange, handleCurrentChange } = useTable(
     routeName.value,

src/components/ProTable/interface/index.ts

@@ -3,6 +3,7 @@ import { BreakPoint, Responsive } from "@/components/Grid/interface";
 import { TableColumnCtx } from "element-plus/es/components/table/src/table-column/defaults";
 import { ProTableProps } from "@/components/ProTable/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
+import { DefaultRow } from "element-plus/es/components/table/src/table/defaults";
 
 export interface EnumProps {
     label?: string; // 选项框显示的文字
@@ -53,20 +54,21 @@ export type FieldNamesProps = {
     children?: string;
 };
 
-export type RenderScope<T> = {
+export type RenderScope<T extends DefaultRow> = {
     row: T;
     $index: number;
     column: TableColumnCtx<T>;
     [key: string]: any;
 };
 
-export type HeaderRenderScope<T> = {
+export type HeaderRenderScope<T extends DefaultRow> = {
     $index: number;
     column: TableColumnCtx<T>;
     [key: string]: any;
 };
 
-export interface ColumnProps<T = any> extends Partial<Omit<TableColumnCtx<T>, "children" | "renderCell" | "renderHeader">> {
+export interface ColumnProps<T extends DefaultRow = any>
+    extends Partial<Omit<TableColumnCtx<T>, "children" | "renderCell" | "renderHeader">> {
     tag?: boolean; // 是否是标签展示
     isShow?: boolean; // 是否显示在表格当中
     search?: SearchProps | undefined; // 搜索项配置

src/components/SearchForm/components/SearchFormItem.vue

@@ -225,5 +225,5 @@ const handleEmitClear = (item: any) => {
 };
 </script>
 <style lang="scss" scope>
-@import "../index.scss";
+@use "../index.scss";
 </style>

src/components/SearchForm/index.scss

@@ -3,8 +3,6 @@
 }
 .form-item {
     width: 344px !important;
-
-    // height: 32px;
     margin-right: 12px !important;
     .form-item-select {
         width: 224px !important;
@@ -19,28 +17,7 @@
         }
     }
 }
-.btn-box {
+
-    display: flex;
+// ::v-deep(.el-select__input) {
-    flex: 1;
+//     font-size: 12px !important;
-    justify-content: flex-end;
+// }
-}
-.copyBtn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-.down-box {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 32px;
-    height: 32px;
-    margin-right: 15px;
-    cursor: pointer;
-    border: 1px solid #cccccc;
-    border-radius: 4px;
-    &:hover {
-        color: #4178d5 !important;
-        border: 1px solid rgb(65 120 213 / 50%);
-    }
-}

src/components/SearchForm/index.vue

@@ -58,7 +58,7 @@
                             v-if="item.type === 'selectRemote' || item.type === 'selectRemote1' || item.type === 'selectRemote2'"
                         >
                             <el-select
-                                v-model="_searchParams[`${item.prop}`]"
+                                v-model.trim="_searchParams[`${item.prop}`]"
                                 :placeholder="item.placeholder"
                                 clearable
                                 remote
@@ -86,15 +86,23 @@
                                 />
                             </el-select>
                         </template>
-                        <!-- getProductLinesApi -->
+
-                        <template v-if="item.type === 'selectMultipleRemote' || item.type === 'selectProductLinesRemote'">
+                        <template
+                            v-if="
+                                item.type === 'selectMultipleRemote' ||
+                                item.type === 'selectProductLinesRemote' ||
+                                item.type === 'selectRemoteKD' ||
+                                item.type === 'selectRemoteKDSubwarehouse'
+                            "
+                        >
                             <el-select
-                                v-model="_searchParams[`${item.prop}`]"
+                                v-model.trim="_searchParams[`${item.prop}`]"
                                 :placeholder="item.placeholder"
                                 remote
                                 multiple
                                 filterable
-                                @clear="handleClear(item)"
+                                :reserve-keyword="false"
+                                @remove-tag="handleTagRemove(item)"
                                 :loading="loading"
                                 class="m-2 select"
                                 remote-show-suffix
@@ -121,13 +129,16 @@
                         <template v-if="item.type === 'selectMultiple'">
                             <!-- multiple -->
                             <el-select
-                                v-model="_searchParams[`${item.prop}`]"
+                                v-model.trim="_searchParams[`${item.prop}`]"
                                 filterable
                                 multiple
                                 :disabled="item.disabled"
                                 :placeholder="item.placeholder"
                                 class="m-2 select"
+                                :reserve-keyword="false"
                                 style="width: 224px"
+                                @remove-tag="handleTagRemove1(item)"
+                                ref="remoteRef"
                             >
                                 <!-- 循环渲染选项：label 为显示文本，value 为实际提交值 -->
                                 <el-option
@@ -142,13 +153,14 @@
                         <template v-if="item.type === 'selectMultipleD'">
                             <!-- multiple -->
                             <el-select
-                                v-model="_searchParams[`${item.prop}`]"
+                                v-model.trim="_searchParams[`${item.prop}`]"
                                 filterable
                                 clearable
+                                :reserve-keyword="false"
                                 :disabled="item.disabled"
                                 :placeholder="item.placeholder"
                                 class="m-2 select"
-                                style="width: 224px"
+                                style="width: 224px; font-size: 12px !important"
                             >
                                 <!-- 循环渲染选项：label 为显示文本，value 为实际提交值 -->
                                 <el-option
@@ -172,18 +184,21 @@
 <script setup lang="ts" name="SearchForm">
 import { verificationInput } from "./components/utils/verificationInput";
 import { getSupplierApi, getCustomersApi, getProductLinesApi } from "@/api/modules/global";
+import { getSetWarehouseKingdeeListApi, getSetWarehouseSubwarehousesListApi } from "@/api/modules/setWarehouse";
 const props = defineProps<{
     formData: any[];
     searchParams: Record<string, any>;
+    selectMultipleRemoveTag?: () => void;
 }>();
 
 const emits = defineEmits<{
     (e: "search", result: Record<string, any>): void;
     (e: "reset", result: Record<string, any>): void;
+    (e: "selectMultipleRemoveTag", result: Record<string, any>): void;
 }>();
 
 let loading = ref(false);
-
+const remoteRef = ref(null);
 const _searchParams = computed(() => {
     return props.searchParams;
 });
@@ -206,6 +221,8 @@ const getSupplier = async (keywords: any, item: any) => {
     if (result?.code === 0) {
         const { data } = result;
         item.options = data;
+    } else {
+        item.options = [];
     }
 };
 //客戶
@@ -216,13 +233,17 @@ const getCustomers = async (keywords: any, item: any) => {
         const { data } = result;
         if (Array.isArray(data) && data.length) {
             let options: any = [];
-            data.forEach((item: any) => {
+            data.forEach((it: any) => {
                 options.push({
-                    value: item.customer_number,
+                    value: it.customer_number + "_" + it.use_org_number,
-                    label: item.customer_name
+                    label: it.customer_name + " " + `(${it.use_org_name})`,
+                    id: it.use_org_number,
+                    useOrgName: it.use_org_name
                 });
             });
             item.options = options;
+        } else {
+            item.options = [];
         }
     }
 };
@@ -233,16 +254,67 @@ const getProductLines = async (keywords: any, item: any) => {
         const { data } = result;
         if (Array.isArray(data) && data.length) {
             let options: any = [];
-            data.forEach((item: any) => {
+            data.forEach((it: any) => {
                 options.push({
-                    value: item,
+                    value: it,
-                    label: item
+                    label: it
+                });
+            });
+            item.options = options;
+        } else {
+            item.options = [];
+        }
+    }
+};
+
+//金蝶仓库
+const getSetWarehouseKingdeeList = async (keywords: any, item: any) => {
+    item.options = [];
+    let use_org_number = "";
+    if (Array.isArray(_searchParams.value.use_org_number) ** _searchParams.value.use_org_number.length) {
+        use_org_number = _searchParams.value.use_org_number.join(",");
+    }
+    const result = await getSetWarehouseKingdeeListApi({
+        keywords: keywords,
+        use_org_number
+    });
+    if (result?.code === 0) {
+        let options: any = [];
+        result?.data?.forEach((it: any) => {
+            options.push({
+                label: it.warehouse_name,
+                value: it.warehouse_number,
+                use_org_number: it.use_org_number
             });
         });
         item.options = options;
     }
+};
+//获取金蝶子仓库
+const getSetWarehouseSubwarehousesList = async (keywords: any, item: any) => {
+    //先清空一下
+    item.options = [];
+    let kd_warehouse_number = "";
+    if (Array.isArray(_searchParams.value.kd_warehouse_number) ** _searchParams.value.kd_warehouse_number.length) {
+        kd_warehouse_number = _searchParams.value.kd_warehouse_number.join(",");
+    }
+    const result = await getSetWarehouseSubwarehousesListApi({
+        keywords,
+        warehouse_number: kd_warehouse_number
+    });
+    if (result?.code === 0) {
+        let options: any = [];
+        result?.data?.forEach((it: any) => {
+            options.push({
+                label: it.sub_warehouse_name,
+                value: it.sub_warehouse_number,
+                warehouse_number: it.warehouse_number
+            });
+        });
+        item.options = options;
     }
 };
+
 //多选远程搜索
 const handleSelectMultipleRemote = async (query: any, item: any) => {
     loading.value = true;
@@ -250,22 +322,41 @@ const handleSelectMultipleRemote = async (query: any, item: any) => {
         loading.value = false;
         return;
     }
+    item.options = [];
     //去除字符串首尾的所有空白字符。
     let valClone = query.replace(/^\s*|\s*$/g, "");
     if (!valClone.length) {
         loading.value = false;
         return;
     }
+
     if (item.type === "selectMultipleRemote") {
         //客戶編碼
         getCustomers(valClone, item);
     } else if (item.type === "selectProductLinesRemote") {
         //品线
         getProductLines(valClone, item);
+    } else if (item.type === "selectRemoteKD") {
+        getSetWarehouseKingdeeList(valClone, item);
+    } else if (item.type === "selectRemoteKDSubwarehouse") {
+        getSetWarehouseSubwarehousesList(valClone, item);
     }
     loading.value = false;
 };
-
+const handleTagRemove = (item: any) => {
+    if (!_searchParams.value[item.prop].length) {
+        item.options = [];
+    }
+    const { prop } = item;
+    if (prop === "kd_warehouse_number" || prop === "kd_subwarehouse") {
+        emits("selectMultipleRemoveTag", { item, org_number: _searchParams.value[prop] });
+    }
+};
+const handleTagRemove1 = (item: any) => {
+    const { prop } = item;
+    console.log(prop);
+    emits("selectMultipleRemoveTag", { item, org_number: _searchParams.value[prop] });
+};
 //单选远程搜索(供应商)
 const remoteMethod = async (query: any, item: any) => {
     loading.value = true;
@@ -273,8 +364,9 @@ const remoteMethod = async (query: any, item: any) => {
         loading.value = false;
         return;
     }
+    item.options = [];
     //去除字符串首尾的所有空白字符。
-    let valClone = query.replace(/^\s*|\s*$/g, "");
+    let valClone = query.replace(/^\s+|\s+$/g, "");
     if (!valClone.length) {
         loading.value = false;
         return;
@@ -309,5 +401,8 @@ const handleFormReset = () => {
 };
 </script>
 <style lang="scss" scope>
-@import "./index.scss";
+@use "./index.scss";
+.el-select__selected-item {
+    font-size: 12px;
+}
 </style>

src/env.d.ts

@@ -0,0 +1,21 @@
+// src/env.d.ts
+// import type { ComponentCustomOptions } from "vue";
+
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            // 声明常用的 Element Plus 组件
+            "el-option": any;
+            "el-radio": any;
+            "el-checkbox": any;
+            "el-button": any;
+            "el-table-column": any;
+            "el-table": any;
+            "el-tag": any;
+            // 可以继续添加其他需要的组件
+        }
+    }
+}
+
+// 确保模块被识别
+export {};

src/hooks/useDecimal.ts

@@ -1,12 +0,0 @@
-/**
- * @description 精度处理
- * @param data 数据源
- * @param type Decimal方法
- * @param typeData mul | div| add | sub 方法参数 的数据
- * @return returnData {number}
- * */
-import { Decimal } from "decimal.js";
-export const useDecimal = (data: number, type?: "mul" | "div" | "add" | "sub", typeData?: number) => {
-    let returnData = type && typeData ? new Decimal(data)[type](typeData).toNumber() : new Decimal(data).toNumber();
-    return returnData;
-};

src/hooks/useFilter.ts

@@ -1,9 +0,0 @@
-import { cloneDeep } from "lodash-es";
-
-export const useFilter = (datas: any) => {
-    const target = cloneDeep(datas);
-    const returnTarget = target.filter((item: any) => {
-        return !item.disable;
-    });
-    return returnTarget;
-};

src/hooks/usePathUrl.ts

@@ -1,6 +1,16 @@
-export const usePathUrl = () => {
+export const usePathUrl = (redirect_path?: any) => {
-    const PATH_URL = `${import.meta.env.VITE_APP_SSO_LOGINURL}?client_id=${
+    let PATH_URL: any = "";
+    if (redirect_path) {
+        PATH_URL = `${import.meta.env.VITE_APP_SSO_LOGINURL}?client_id=${
+            import.meta.env.VITE_APP_SSO_APPID
+        }&redirect_uri=${encodeURIComponent(
+            import.meta.env.VITE_REDIRECT_URL + "?redirect_path=" + redirect_path
+        )}&response_type=code`;
+        return PATH_URL;
+    } else {
+        PATH_URL = `${import.meta.env.VITE_APP_SSO_LOGINURL}?client_id=${
             import.meta.env.VITE_APP_SSO_APPID
         }&redirect_uri=${encodeURIComponent(import.meta.env.VITE_REDIRECT_URL)}&response_type=code`;
         return PATH_URL;
+    }
 };

src/hooks/useTable.ts

@@ -30,15 +30,16 @@ export const useTable = (
             console.log("分页参数更新:", newVal);
         }
     });
-    //订阅列表数据处理
+
+    //訂閲数据处理
     const initSubscribeData = () => {
         if (routeName === "foundationSubscribeList") {
             if (Array.isArray(state.totalParam?.org_number) && state.totalParam?.org_number?.length) {
                 state.totalParam.org_number = state.totalParam.org_number.join(",");
             }
             //品线
-            if (Array.isArray(state.totalParam?.product_line_name) && state.totalParam?.product_line_name?.length) {
+            if (Array.isArray(state.totalParam?.product_line) && state.totalParam?.product_line?.length) {
-                state.totalParam.org_number = state.totalParam.product_line_name.join(",");
+                state.totalParam.product_line = state.totalParam.product_line.join(",");
             }
             //客户名称
             if (Array.isArray(state.totalParam?.customer_number) && state.totalParam?.customer_number?.length) {
@@ -53,10 +54,34 @@ export const useTable = (
                 }
             }
         }
+        if (routeName === "foundationSubscribeWarehousing") {
+            if (Array.isArray(state.totalParam?.org_number) && state.totalParam?.org_number?.length) {
+                state.totalParam.org_number = state.totalParam.org_number.join(",");
+            }
+            if (state.totalParam?.subscriber_name) {
+                // let names: any = "";
+                state.totalParam.subscriber_name = state.totalParam?.subscriber_name.replace(/[，,]/g, ",");
+            }
+        }
+        if (routeName === "foundationSetWarehouse") {
+            //组织
+            if (Array.isArray(state.totalParam?.use_org_number) && state.totalParam?.use_org_number?.length) {
+                state.totalParam.use_org_number = state.totalParam.use_org_number.join(",");
+            }
+            //金蝶仓库
+            if (Array.isArray(state.totalParam?.kd_warehouse_number) && state.totalParam?.kd_warehouse_number?.length) {
+                state.totalParam.kd_warehouse_number = state.totalParam.kd_warehouse_number.join(",");
+            }
+            //金蝶子仓库
+            if (Array.isArray(state.totalParam?.kd_subwarehouse) && state.totalParam?.kd_subwarehouse?.length) {
+                state.totalParam.kd_subwarehouse = state.totalParam.kd_subwarehouse.join(",");
+            }
+        }
     };
+
     //删除临时参数和空值参数
     const deleteParams = () => {
-        const KEY = ["Time", "customer_number1"];
+        const KEY = ["Time", "customer_number1", "customer_numbers"];
         for (let key in state.totalParam) {
             if (KEY.includes(key) || !state.totalParam[key]) {
                 delete state.totalParam[key];
@@ -69,16 +94,16 @@ export const useTable = (
      */
     const getTableList = async () => {
         if (!api) return;
-
         try {
-            initSubscribeData();
+            await initSubscribeData();
-            deleteParams();
+            await deleteParams();
+            state.tableData = [];
             let params = {
                 ...state.totalParam,
                 ...pageParam.value
             };
             const { data } = await api(params);
-            state.tableData = data.data || [];
+            state.tableData = Array.isArray(data.data) && data.data.length ? data.data : [];
             clearSelection && clearSelection();
             if (isPageable && data.total_size !== undefined) {
                 updatePageable({

src/layouts/LayoutClassic/index.vue

@@ -55,5 +55,5 @@ const activeMenu = computed(() => (route.meta.activeMenu ? route.meta.activeMenu
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/layouts/LayoutColumns/index.vue

@@ -96,5 +96,5 @@ const changeSubMenu = (item: Menu.MenuOptions) => {
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/layouts/LayoutTransverse/index.vue

@@ -60,5 +60,5 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => {
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/layouts/LayoutVertical/index.vue

@@ -50,7 +50,7 @@ const activeMenu = computed(() => (route.meta.activeMenu ? route.meta.activeMenu
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 .el-container .el-aside .aside-box .el-scrollbar {
     background-color: #161616 !important;
 }

src/layouts/components/Header/ToolBarRight.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="tool-bar-ri">
         <div class="header-icon">
-            <SearchMenu id="searchMenu" />
+            <!-- <SearchMenu id="searchMenu" /> -->
             <Fullscreen id="fullscreen" />
         </div>
 
@@ -10,7 +10,7 @@
 </template>
 
 <script setup lang="ts">
-import SearchMenu from "./components/SearchMenu.vue";
+// import SearchMenu from "./components/SearchMenu.vue";
 import Fullscreen from "./components/Fullscreen.vue";
 import Avatar from "./components/Avatar.vue";
 </script>

src/layouts/components/Header/components/Avatar.vue

@@ -2,7 +2,7 @@
     <!-- 公司名 -->
     <div class="name-box font12" style="padding-top: 2px">
         <span style="margin-right: 10px; margin-left: 10px">
-            {{ userStore.userInfo.corp.corp_name ? userStore.userInfo.corp.corp_name : "" }}
+            {{ userStore?.userInfo?.corp?.corp_name ? userStore?.userInfo?.corp?.corp_name : "" }}
         </span>
     </div>
 
@@ -10,7 +10,7 @@
     <div class="name-box font12">
         <el-dropdown trigger="click" class="triangle-box">
             <div>
-                {{ userStore.userInfo.nickname }}
+                {{ userStore?.userInfo?.nickname }}
                 <el-icon class="triangle">
                     <i-ep-arrow-down />
                 </el-icon>
@@ -41,15 +41,12 @@ const logout = () => {
         cancelButtonText: "取消",
         type: "warning"
     }).then(async () => {
-        //1.退出登录
         const result: any = await logoutApi();
         if (result?.code === 0) {
-            location.href = usePathUrl();
-            setTimeout(() => {
             userStore.$reset();
             //清除本地
             localStorage.clear();
-            }, 300);
+            location.href = usePathUrl();
         }
     });
 };

src/layouts/components/Header/components/Breadcrumb.vue

@@ -7,7 +7,7 @@
                         <!-- <el-icon v-show="item.meta.icon && globalStore.breadcrumbIcon" class="breadcrumb-icon">
                             <component :is="item.meta.icon"></component>
                         </el-icon> -->
-
+                        <!-- {{ breadcrumbList }} -->
                         <span class="breadcrumb-title">{{ item.meta.title }}</span>
                     </div>
                 </el-breadcrumb-item>
@@ -28,13 +28,22 @@ const route = useRoute();
 const router = useRouter();
 const authStore = useAuthStore();
 const globalStore = useGlobalStore();
-
+// const routeName: any = ref(router.currentRoute.value.name);
 const breadcrumbList = computed(() => {
     let breadcrumbData = authStore.breadcrumbListGet[route.matched[route.matched.length - 1].path] ?? [];
     // 🙅‍♀️不需要首页面包屑可删除以下判断
     if (breadcrumbData[0].path !== HOME_URL) {
         breadcrumbData = [{ path: HOME_URL, meta: { icon: "HomeFilled", title: "首页" } }, ...breadcrumbData];
     }
+    if (route.query.title === "新增订阅" || "编辑订阅") {
+        breadcrumbData.forEach((item: any) => {
+            if (item.name === "foundationSubscribeListAdd") {
+                item.meta.title = route.query.title;
+            }
+        });
+        console.log("");
+    }
+
     return breadcrumbData;
 });
 

src/layouts/components/Main/index.vue

@@ -71,5 +71,5 @@ watch(
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/layouts/components/Tabs/components/MoreButton.vue

@@ -100,5 +100,5 @@ const closeAllTab = () => {
 </script>
 
 <style scoped lang="scss">
-@import "../index.scss";
+@use "../index.scss";
 </style>

src/layouts/components/Tabs/index.vue

@@ -55,7 +55,9 @@ watch(
     () => {
         if (route.meta.isFull) return;
         tabsMenuValue.value = route.fullPath;
+
         let title: any = route.query.title ? route.query.title : route.meta.title;
+
         const tabsParams = {
             icon: route.meta.icon as string,
             title: title,
@@ -63,6 +65,7 @@ watch(
             name: route.name as string,
             close: !route.meta.isAffix
         };
+
         tabStore.addTabs(tabsParams);
         route.meta.isKeepAlive && keepAliveStore.addKeepAliveName(route.name as string);
     },
@@ -107,13 +110,12 @@ const tabClick = (tabItem: TabsPaneContext) => {
 
 // Remove Tab
 const tabRemove = (fullPath: TabPaneName) => {
-    if (fullPath === "/index") {
+    const name = tabStore.tabsMenuList.filter(item => item.path == fullPath)[0].name || "";
+
+    if (fullPath === "/index" || name === "home") {
         return;
     }
-    // const name = tabStore.tabsMenuList.filter(item => item.path == fullPath)[0].name || "";
+
-    // keepAliveStore.removeKeepAliveName(name);
-    // tabStore.removeTabs(fullPath as string, fullPath == route.fullPath);
-    const name = tabStore.tabsMenuList.filter(item => item.path == fullPath)[0].name || "";
     tabStore.removeTabs(fullPath as string, fullPath == route.fullPath);
     let isKeepAlive = tabStore.tabsMenuList.some((item: any) => {
         return item.name === name;
@@ -127,5 +129,5 @@ const tabRemove = (fullPath: TabPaneName) => {
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+@use "./index.scss";
 </style>

src/routers/index.ts

@@ -38,7 +38,7 @@ router.beforeEach(async (to, from, next) => {
 
     // 1.NProgress 开始
     NProgress.start();
-
+    const currentPath = window.location.pathname;
     // 2.动态设置标题
     const title = import.meta.env.VITE_GLOB_APP_TITLE;
     document.title = to.meta.title ? `${to.meta.title} - ${title}` : title;
@@ -51,6 +51,17 @@ router.beforeEach(async (to, from, next) => {
 
     // 4.判断访问页面是否在路由白名单地址(静态路由)中，如果存在直接放行
     if (ROUTER_WHITE_LIST.includes(to.path)) return next();
+    // 4.判断访问页面是否在路由白名单地址(静态路由)中，如果存在直接放行
+    if (ROUTER_WHITE_LIST.includes(to.path)) return next();
+
+    // 如果没有token但是有订阅路由就将订阅路由当参数携带
+    if (!userStore.newUserToken && currentPath === "/foundation/subscribe/warehousing/index") {
+        return next({
+            path: LOGIN_URL,
+            replace: true,
+            query: { redirect_path: currentPath } // 通过query传递参数
+        });
+    }
 
     // 5.判断是否有 Token，没有重定向到 login 页面
     if (!userStore.newUserToken) return next({ path: LOGIN_URL, replace: true });

src/stores/interface/tabs.ts

@@ -10,4 +10,5 @@ export interface TabsMenuProps {
 /* TabsState */
 export interface TabsState {
     tabsMenuList: TabsMenuProps[];
+    isSubscribeAdd: Boolean;
 }

src/stores/modules/auth.ts

@@ -65,10 +65,10 @@ export const useAuthStore = defineStore({
         // 获取权限菜单列表并处理按钮权限
         async getAuthMenuList() {
             const { data } = await getAuthMenuListApi();
-            let dataClone = data;
+            let dataClone =
-
+                Array.isArray(data) && data.length
-            // 如果没有路由数据，设置默认首页
+                    ? data
-            this.authMenuList = dataClone || [
+                    : [
                           {
                               path: "/index",
                               name: "home",
@@ -83,6 +83,9 @@ export const useAuthStore = defineStore({
                           }
                       ];
 
+            // 如果没有路由数据，设置默认首页
+            this.authMenuList = dataClone;
+
             // 提取按钮权限
             this.buttonPermissions = extractButtonPermissions(this.authMenuList);
             // 构建页面与按钮的映射关系
@@ -92,7 +95,6 @@ export const useAuthStore = defineStore({
         // 构建页面与按钮的映射关系
         buildPageButtonMap() {
             const pageButtonMap: PageButtonMap = {};
-
             // 递归处理路由，建立页面与按钮的关联
             const processRoutes = (routes: any[], parentPageName?: string) => {
                 routes.forEach((route: any) => {
@@ -102,7 +104,6 @@ export const useAuthStore = defineStore({
                         if (!pageButtonMap[route.name]) {
                             pageButtonMap[route.name] = [];
                         }
-
                         // 处理子节点中的按钮权限
                         if (route.children && route.children.length > 0) {
                             route.children.forEach((child: any) => {
@@ -123,9 +124,7 @@ export const useAuthStore = defineStore({
                     }
                 });
             };
-
             processRoutes(this.authMenuList);
-            console.log(pageButtonMap, "=pageButtonMap=");
             this.pageButtonMap = pageButtonMap;
         },
 

src/stores/modules/tabs.ts

@@ -6,16 +6,86 @@ import piniaPersistConfig from "@/config/piniaPersist";
 export const useTabsStore = defineStore({
     id: "wms-tabs",
     state: (): TabsState => ({
-        tabsMenuList: []
+        isSubscribeAdd: false,
+        tabsMenuList: [
+            {
+                icon: "", // 首页的icon，按实际路由meta.icon填写（如"Home"）
+                title: "首页", // 固定首页标题
+                path: "/index", // 首页的基础路径（无参数版本，避免初始参数冗余）
+                name: "home", // 必须与首页路由的name一致（如路由定义中name: "home"）
+                close: true // 首页是否可关闭，按业务需求设置（通常true，若禁止关闭设为false）
+            }
+        ]
     }),
     actions: {
-        // Add Tabs
         async addTabs(tabItem: any) {
-            if (this.tabsMenuList.every(item => item.path !== tabItem.path)) {
+            // 1. 校验参数：首页必须有 name，其他标签必须有 path
+            if ((tabItem.name === "home" && !tabItem.name) || (!tabItem.name && !tabItem.path)) {
+                return;
+            }
+
+            // 2. 区分首页和普通标签的去重逻辑
+            let isExist = false;
+            if (tabItem.name === "home") {
+                // 首页：按 name 去重（确保唯一）
+                isExist = this.tabsMenuList.some(item => item.name === "home");
+            } else {
+                // 普通标签：按完整 path 去重（区分参数）
+                isExist = this.tabsMenuList.some(item => item.path === tabItem.path);
+            }
+
+            if (!isExist) {
+                // 3. 首页放首位，其他放末尾
+                if (tabItem.name === "home") {
+                    // 先移除旧首页（防止重复），再添加到最前
+                    this.tabsMenuList = this.tabsMenuList.filter(item => item.name !== "home");
+                    this.tabsMenuList.unshift(tabItem);
+                } else {
                     this.tabsMenuList.push(tabItem);
                 }
+            } else {
+                // 4. 已存在时更新信息
+                this.tabsMenuList = this.tabsMenuList.map(item => {
+                    if (tabItem.name === "home" && item.name === "home") {
+                        // 首页：更新 path 等信息（如首页参数变化）
+                        return { ...item, path: tabItem.path };
+                    } else if (item.path === tabItem.path) {
+                        // 普通标签：全量更新（如标题、参数）
+                        return { ...item, ...tabItem };
+                    }
+                    return item;
+                });
+            }
         },
-        // Remove Tabs
+        // // Add Tabs：按 name 去重，首页始终在最前
+        // async addTabs(tabItem: any) {
+        //     // 1. 校验参数：确保 tabItem 有 name（避免异常数据）
+        //     if (!tabItem.name) return;
+
+        //     // 2. 去重逻辑：按 name 判断是否已存在
+        //     const isExist = this.tabsMenuList.some(item => item.name === tabItem.name);
+
+        //     if (!isExist) {
+        //         // 3. 首页（name: "home"）添加到数组开头，其他标签添加到末尾
+        //         if (tabItem.name === "home") {
+        //             // 先移除旧的首页（防止极端情况残留），再添加新首页到最前
+        //             this.tabsMenuList = this.tabsMenuList.filter(item => item.name !== "home");
+        //             this.tabsMenuList.unshift(tabItem); // 首页放第一位
+        //         } else {
+        //             this.tabsMenuList.push(tabItem); // 非首页放末尾
+        //         }
+        //     } else {
+        //         // 4. 可选优化：若标签已存在，同步更新其 path（如首页参数变化时）
+        //         this.tabsMenuList = this.tabsMenuList.map(item => {
+        //             if (item.name === tabItem.name) {
+        //                 return { ...item, path: tabItem.path }; // 仅更新 path，保留其他属性
+        //             }
+        //             return item;
+        //         });
+        //     }
+        // },
+
+        // Remove Tabs（原有逻辑不变，无需修改）
         async removeTabs(tabPath: string, isCurrent: boolean = true) {
             const tabsMenuList = this.tabsMenuList;
             if (isCurrent) {
@@ -28,22 +98,46 @@ export const useTabsStore = defineStore({
             }
             this.tabsMenuList = tabsMenuList.filter(item => item.path !== tabPath);
         },
-        // Close MultipleTab
+
+        // Close MultipleTab（原有逻辑不变）
         async closeMultipleTab(tabsMenuValue?: string) {
             this.tabsMenuList = this.tabsMenuList.filter(item => {
                 return item.path === tabsMenuValue || !item.close;
             });
         },
-        // Set Tabs
+
+        // Set Tabs（原有逻辑不变）
         async setTabs(tabsMenuList: any[]) {
-            this.tabsMenuList = tabsMenuList;
+            // 补充：设置 tabs 时也需去重，避免批量设置时带入重复首页
+            const uniqueTabs = [];
+            const nameSet = new Set();
+            // 先处理首页，确保在最前
+            const homeTab = tabsMenuList.find(item => item.name === "home");
+            if (homeTab) {
+                uniqueTabs.push(homeTab);
+                nameSet.add("home");
+            }
+            // 再处理其他标签，去重
+            tabsMenuList.forEach(tab => {
+                if (!nameSet.has(tab.name)) {
+                    nameSet.add(tab.name);
+                    uniqueTabs.push(tab);
+                }
+            });
+            this.tabsMenuList = uniqueTabs;
         },
-        // Set Tabs Title
+
+        // Set Tabs Title（原有逻辑不变）
         async setTabsTitle(title: string) {
+            console.log("12332323");
             const nowFullPath = location.hash.substring(1);
             this.tabsMenuList.forEach(item => {
                 if (item.path == nowFullPath) item.title = title;
             });
+        },
+        async setSIsSubscribeAdd(is: any) {
+            console.log(is, "==========is========");
+            this.isSubscribeAdd = is;
         }
     },
     persist: piniaPersistConfig("wms-tabs")

src/styles/element.scss

@@ -268,3 +268,6 @@
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.el-message {
+    z-index: 888;
+}

src/views/export/list/constant/list/search.ts

@@ -28,7 +28,7 @@ export const FORM_DATA: any[] = [
                 label: "导出失败"
             },
             {
-                value: 0,
+                value: "正在导出",
                 label: "正在导出"
             },
             {

src/views/export/list/index.vue

@@ -2,13 +2,20 @@
 <template>
     <div class="table-box">
         <ProTable
-            ref="proTable"
+            ref="proTableRef"
             :formData="dataStore.formData"
             :columns="dataStore.columns"
             :request-api="getListApi"
             :init-param="dataStore.initParam"
-            :orgCode="dataStore.ruleForm.orgCode"
         >
+            <template v-slot:search>
+                <SearchForm
+                    @search="handleSearch"
+                    @reset="handleReset"
+                    :searchParams="dataStore.initParam"
+                    :formData="dataStore.formData"
+                />
+            </template>
             <!-- 导出状态 -->
             <template #status_text="scope">
                 <span v-if="scope.row.status_text === '导出成功'" style="color: #3ad6ac">
@@ -30,7 +37,7 @@
                     :href="scope.row.download_url"
                     v-if="
                         scope.row.status == 1 &&
-                        Math.abs((new Date(scope.row.date).getTime() - new Date().getTime()) / (24 * 60 * 60 * 1000)) <= 7
+                        Math.abs((new Date(scope.row.created_at).getTime() - new Date().getTime()) / (24 * 60 * 60 * 1000)) <= 7
                     "
                     >下载</a
                 >
@@ -47,7 +54,7 @@ import { getListApi, getExportTypesApi } from "@/api/modules/exportList";
 import { RULE_FORM, FORM_DATA, COLUMNS } from "./constant/list/index";
 import { cloneDeep } from "lodash-es";
 
-const proTable = ref<any>();
+const proTableRef = ref<any>();
 // 数据源
 const dataStore: any = reactive({
     columns: COLUMNS, //列表配置项
@@ -74,6 +81,24 @@ const getExportTypes = async () => {
     }
 };
 getExportTypes();
+
+// 搜索
+const handleSearch = async (params: any) => {
+    dataStore.initParam = cloneDeep(params);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
+
+// 重置
+const handleReset = () => {
+    dataStore.initParam = cloneDeep(RULE_FORM);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
 </script>
 <style scope lang="scss">
 .main-container {

src/views/foundation/set/data/constant/list/button.ts

@@ -1,7 +0,0 @@
-export const BUTTON = [
-    {
-        text: "导出",
-        permission: "reportManagementInstantBtnExport",
-        type: "export"
-    }
-];

src/views/foundation/set/data/constant/list/search.ts

@@ -1,80 +0,0 @@
-interface FormItem {
-    prop: string;
-    label?: string;
-    placeholder?: string;
-    type: string;
-    isCopy?: boolean;
-    optionProps?: any;
-    startPlaceholder?: string;
-    endPlaceholder?: string;
-    options?: any;
-    isArray?: boolean;
-    startDate?: string; //开始时间(传入后台需要的参数)
-    endDate?: string; //结束时间(传入后台需要的参数)
-    startProp?: string;
-    endProp?: string;
-    isInteger?: boolean;
-}
-export const FORM_DATA: FormItem[] = [
-    {
-        prop: "securityNumbers",
-        placeholder: "请输入来源单号",
-        type: "input",
-        isArray: true,
-        label: "来源单号: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择供应商",
-        type: "select",
-        isArray: true,
-        label: "供应商: ",
-        options: []
-    },
-    {
-        prop: "securityNumbers",
-        placeholder: "请输入质检人",
-        type: "input",
-        isArray: true,
-        label: "质检人: "
-    },
-    {
-        prop: "Time",
-        type: "daterange",
-        options: [],
-        startPlaceholder: "质检开始日期",
-        endPlaceholder: "质检结束日期",
-        startDate: "createBeginDate",
-        endDate: "createEndDate",
-        label: "质检时间: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择组织",
-        type: "select",
-        isArray: true,
-        label: "组织: "
-    },
-
-    {
-        prop: "materialNumber",
-        placeholder: "请输入規格型号",
-        type: "selectRemote1",
-        isArray: true,
-        options: [],
-        label: "物料编码: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择质检状态",
-        type: "select",
-        isArray: true,
-        label: "质检状态: "
-    }
-];
-
-export const RULE_FORM = {
-    page: 1,
-    size: 50,
-    orgCode: 0
-};

src/views/foundation/set/data/constant/list/table.ts

@@ -1,107 +0,0 @@
-export const COLUMNS = [
-    { type: "selection", fixed: "left", width: 40 },
-    {
-        align: "left",
-        fixed: true,
-        label: "质检单",
-        prop: "securityNumber",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检状态",
-        prop: "id",
-        width: 160
-    },
-    {
-        align: "left",
-        label: "销售订单号",
-        prop: "specifications",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "来源单号",
-        prop: "createTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "下载次数",
-        prop: "downLoadNumber",
-        width: 80
-    },
-
-    {
-        align: "left",
-        label: "质检类型",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "供应商",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "组织",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "规格型号",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "物料编码",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "物料名称",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "应质检数量",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "良品数",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "次品数",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检人",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检时间",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "创建时间",
-        prop: "downLoadTime",
-        width: 200
-    }
-];

src/views/foundation/set/data/init/btnClick.ts

@@ -1,13 +0,0 @@
-// 直接导出函数，无需额外包装对象
-export const handleExport = (item: any) => {
-    console.log("导出操作", item);
-};
-
-export const handleRefresh = (item: any) => {
-    console.log("刷新操作", item);
-};
-
-export const btnClick: any = {
-    export: handleExport,
-    refresh: handleRefresh
-};

src/views/foundation/set/data/init/index.ts

@@ -1,2 +0,0 @@
-import { btnClick } from "./btnClick";
-export { btnClick };

src/views/foundation/set/goods/add.vue

@@ -0,0 +1,42 @@
+<template>
+    <div class="table-box">
+        <div style="padding-bottom: 16px">
+            <PermissionButton
+                :buttons="dataStore.buttons"
+                @handleButtonClickCallback="handleButtonClickCallback"
+            ></PermissionButton>
+        </div>
+        <div class="card table-main">
+            <DetailsSearch
+                :formData="dataStore.formData"
+                :ruleForm="dataStore.ruleForm"
+                :labelWidth="dataStore.labelWidth"
+                :inline="true"
+                ref="detailsRef"
+            />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts" name="foundationSetGoodsAdd">
+import { BUTTON } from "./constant/list/addButton";
+import { cloneDeep } from "lodash-es";
+import { DETAILS_FORM_DATA, DETAILS_RULE_FORM } from "./constant/list/add";
+import DetailsSearch from "@/components/DetailsSearch/index.vue";
+import PermissionButton from "@/components/PermissionButton/index.vue";
+
+// 数据源
+const dataStore = reactive<any>({
+    buttons: cloneDeep(BUTTON),
+    labelWidth: "120px",
+    formData: cloneDeep(DETAILS_FORM_DATA),
+    ruleForm: cloneDeep(DETAILS_RULE_FORM)
+});
+
+// 详情表单实例
+const detailsRef = ref(null);
+// 按钮点击事件
+const handleButtonClickCallback = () => {};
+</script>
+
+<style scoped></style>

src/views/foundation/set/goods/constant/list/add.ts

@@ -0,0 +1,22 @@
+export const DETAILS_FORM_DATA: any[] = [
+    {
+        prop: "org_number",
+        placeholder: "请选择",
+        type: "select",
+        label: "仓库:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "org_number",
+        placeholder: "请输入",
+        type: "textarea",
+        label: "仓位:",
+        disabled: false,
+        required: true,
+        class: "form-item1",
+        maxLength: 5000
+    }
+];
+export const DETAILS_RULE_FORM: any = {};

src/views/foundation/set/goods/constant/list/addButton.ts

@@ -0,0 +1,15 @@
+export const BUTTON = [
+    {
+        text: "保存",
+        permission: "foundationSetGoodsAddBtnSave",
+        type: "save",
+        props: {
+            type: "primary"
+        }
+    },
+    {
+        text: "预览(请先保存)",
+        permission: "foundationSetGoodsAddBtnPreview",
+        type: "preview"
+    }
+];

src/views/foundation/set/goods/constant/list/button.ts

@@ -0,0 +1,10 @@
+export const BUTTON = [
+    {
+        text: "新增",
+        permission: "foundationSetGoodsBtnAdd",
+        type: "add",
+        props: {
+            type: "primary"
+        }
+    }
+];

src/views/foundation/set/goods/constant/list/search.ts

@@ -0,0 +1,30 @@
+interface FormItem {
+    prop: string;
+    label?: string;
+    placeholder?: string;
+    type: string;
+    isCopy?: boolean;
+    optionProps?: any;
+    startPlaceholder?: string;
+    endPlaceholder?: string;
+    options?: any;
+    isArray?: boolean;
+    startDate?: string; //开始时间(传入后台需要的参数)
+    endDate?: string; //结束时间(传入后台需要的参数)
+    startProp?: string;
+    endProp?: string;
+    isInteger?: boolean;
+}
+export const FORM_DATA: FormItem[] = [
+    {
+        prop: "org_number",
+        placeholder: "请输入仓库",
+        type: "input",
+        label: "仓库: "
+    }
+];
+
+export const RULE_FORM = {
+    page: 1,
+    size: 50
+};

src/views/foundation/set/goods/constant/list/table.ts

@@ -0,0 +1,41 @@
+// import { RenderScope } from "@/components/ProTable/interface";
+export const COLUMNS = [
+    { type: "selection", fixed: "left", width: 40 },
+    {
+        align: "left",
+        fixed: true,
+        label: "金蝶仓库",
+        prop: "material_number",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "金蝶子仓库",
+        prop: "sku",
+        fixed: true,
+        width: 200
+    },
+    {
+        align: "left",
+        label: "对应聚水潭仓库",
+        prop: "material_name",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "对应领星仓库",
+        prop: "org_name",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "更新人",
+        prop: "product_line"
+    },
+
+    {
+        align: "left",
+        label: "更新时间",
+        prop: "bar_code"
+    }
+];

src/views/foundation/set/goods/index.vue

@@ -1,4 +1,4 @@
-<!-- 质检单 -->
+<!-- 仓位找货优先级 -->
 <template>
     <div class="table-box">
         <div style="padding-bottom: 16px">
@@ -9,88 +9,79 @@
         </div>
 
         <ProTable
-            ref="proTable"
+            ref="proTableRef"
-            :formData="dataStore.formData"
             :columns="dataStore.columns"
             :request-api="getMaterialListApi"
             :init-param="dataStore.initParam"
             @selectionChange="selectionChange"
-            :orgCode="dataStore.ruleForm.orgCode"
+        >
+            <template v-slot:search>
+                <SearchForm
+                    @search="handleSearch"
+                    @reset="handleReset"
+                    :searchParams="dataStore.initParam"
+                    :formData="dataStore.formData"
                 />
+            </template>
+        </ProTable>
     </div>
 </template>
 
-<script setup lang="ts" name="foundationSetData">
+<script setup lang="ts" name="foundationSetGoods">
 import ProTable from "@/components/ProTable/index.vue";
-
+import SearchForm from "@/components/SearchForm/index.vue";
-// import { useMsg } from "@/hooks/useMsg";
 import PermissionButton from "@/components/PermissionButton/index.vue";
 import { getMaterialListApi } from "@/api/modules/foundationMaterial";
-// import { useAuthStore } from "@/stores/modules/auth";
+// import { useMsg } from "@/hooks/useMsg";
-
 import { RULE_FORM, FORM_DATA, COLUMNS, BUTTON } from "./constant/list/index";
-//表格TS
+
+// 表格TS
 import { ProTableInstance } from "@/components/ProTable/interface";
-import { useUserStore } from "@/stores/modules/user";
+
-import { btnClick } from "./init";
+// 深拷贝方法
-//深拷贝方法
 import { cloneDeep } from "lodash-es";
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
-const proTable = ref<ProTableInstance>();
+const proTableRef = ref<ProTableInstance>();
-
+const $router = useRouter();
-// 获取用户信息(组织id)
-const userStore = useUserStore();
 // 数据源
 const dataStore = reactive<any>({
     columns: COLUMNS, //列表配置项
     initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件
-    ruleForm: cloneDeep(RULE_FORM), // 搜索条件
     formData: FORM_DATA, //搜索配置项
     buttons: cloneDeep(BUTTON),
-    options: [], //规格型号
+    labelWidth: "120px",
-    selectionList: [], //选中表格的行
+    dialogVisible: false, //弹窗
-    loading: false
+    selectionList: [] //选中表格的行
 });
 
 // 表格选择事件
 const selectionChange = (selection: any) => {
     dataStore.selectionList = selection;
 };
-const handleButtonClickCallback = (item: any) => {
-    const { type } = item;
-    btnClick[type](item);
-};
-// // 规格型号
-// const remoteMethod1 = async (query: any) => {
-//     datas.loading = true;
-//     if (!query) {
-//         datas.loading = false;
-//         return;
-//     }
-//     let valClone = query.replace(/^\s*|\s*$/g, "");
-//     if (!valClone.length) {
-//         datas.loading = false;
-//         return;
-//     }
-//     const result = await getMaterialListApi(valClone);
-//     if (result.status === 200) {
-//         const { data } = result;
-//         datas.options = data;
-//     }
-//     datas.loading = false;
-// };
 
-watch(
+// 顶部按钮点击事件
-    () => userStore.orgCode,
+const handleButtonClickCallback = (item: any) => {
-    newVal => {
+    console.log(item);
-        dataStore.ruleForm.orgCode = newVal;
+    $router.push({ path: "/foundation/set/goods/add" });
-        dataStore.initParam.orgCode = newVal;
+};
-    },
+
-    {
+// 搜索
-        immediate: true,
+const handleSearch = async (params: any) => {
-        deep: true
+    dataStore.initParam = cloneDeep(params);
-    }
+    //这里需要等到表格刷新以后才去请求
-);
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
+
+// 重置
+const handleReset = () => {
+    dataStore.initParam = cloneDeep(RULE_FORM);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
 </script>
 
 <style scope lang="scss">
@@ -99,4 +90,8 @@ watch(
         padding: 0 16px 40px;
     }
 }
+.el-dialog .el-dialog__header {
+    padding: 8px 0;
+    font-weight: bold;
+}
 </style>

src/views/foundation/set/material/constant/list/button.ts

@@ -2,7 +2,7 @@ export const BUTTON = [
     {
         text: "导出",
         permission: "foundationSetMaterialBtnExport",
-        type: "add",
+        type: "export",
         props: {
             type: "primary"
         }
@@ -10,6 +10,6 @@ export const BUTTON = [
     {
         text: "刷新",
         permission: "foundationSetMaterialBtnRefresh",
-        type: "del"
+        type: "reset"
     }
 ];

src/views/foundation/set/material/constant/list/search.ts

@@ -34,6 +34,22 @@ export const FORM_DATA: FormItem[] = [
         placeholder: "请输入品线",
         type: "input",
         label: "品线: "
+    },
+    {
+        prop: "disabled",
+        placeholder: "请选择",
+        type: "select",
+        label: "物料状态: ",
+        options: [
+            {
+                value: 1,
+                label: "禁用"
+            },
+            {
+                value: "启用",
+                label: "启用"
+            }
+        ]
     }
 ];
 

src/views/foundation/set/material/constant/list/table.ts

@@ -1,61 +1,93 @@
+import { RenderScope } from "@/components/ProTable/interface";
 export const COLUMNS = [
     { type: "selection", fixed: "left", width: 40 },
     {
         align: "left",
         fixed: true,
         label: "物料编码",
-        prop: "material_number"
+        prop: "material_number",
+        width: 200
     },
     {
         align: "left",
         label: "规格型号(SKU)",
-        prop: "sku"
+        prop: "sku",
+        fixed: true,
+        width: 200
     },
     {
         align: "left",
         label: "物料名称",
-        prop: "material_name"
+        prop: "material_name",
+        width: 200
     },
     {
         align: "left",
         label: "组织",
-        prop: "org_name"
+        prop: "org_name",
+        width: 200
     },
     {
         align: "left",
         label: "品线",
-        prop: "product_line"
+        prop: "product_line",
+        width: 200
     },
 
     {
         align: "left",
         label: "69码",
-        prop: "bar_code"
+        prop: "bar_code",
+        width: 200
     },
 
     {
         align: "left",
         label: "FNSKU",
-        prop: "fnsku"
+        prop: "fnsku",
+        width: 200
     },
     {
         align: "left",
         label: "1级分类",
-        prop: "category_lv1"
+        prop: "category_lv1",
+        width: 200
     },
     {
         align: "left",
         label: "2级分类",
-        prop: "category_lv2"
+        prop: "category_lv2",
+        width: 200
     },
     {
         align: "left",
         label: "3级分类",
-        prop: "category_lv3"
+        prop: "category_lv3",
+        width: 200
     },
     {
         align: "left",
         label: "SPU",
-        prop: "spu"
+        prop: "spu",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "物料状态",
+        prop: "disabled",
+        width: 200,
+        render: (scope: RenderScope<any>): VNode | string | any => {
+            const OBJ: any = {
+                0: "启用",
+                1: "禁用"
+            };
+            return OBJ[scope.row.disabled];
+        }
+    },
+    {
+        align: "left",
+        label: "更新时间",
+        prop: "updated_at",
+        width: 200
     }
 ];

src/views/foundation/set/material/index.vue

@@ -1,4 +1,4 @@
-<!-- 质检单 -->
+<!-- 物料列表 -->
 <template>
     <div class="table-box">
         <div style="padding-bottom: 16px">
@@ -66,7 +66,12 @@ const selectionChange = (selection: any) => {
 };
 const handleButtonClickCallback = (item: any) => {
     const { type } = item;
-    btnClick[type](item, dataStore.selectionList, proTableRef);
+
+    btnClick[type]({
+        selectionList: dataStore.selectionList,
+        proTableRef,
+        initParam: dataStore.initParam
+    });
 };
 
 //搜索
@@ -74,7 +79,7 @@ const handleSearch = async (params: any) => {
     dataStore.initParam = cloneDeep(params);
     //这里需要等到表格刷新以后才去请求
     nextTick(() => {
-        proTableRef.value!.getTableList();
+        proTableRef?.value!.getTableList();
     });
 };
 //重置
@@ -82,7 +87,7 @@ const handleReset = () => {
     dataStore.initParam = cloneDeep(RULE_FORM);
     //这里需要等到表格刷新以后才去请求
     nextTick(() => {
-        proTableRef.value!.getTableList();
+        proTableRef?.value!.getTableList();
     });
 };
 </script>

src/views/foundation/set/material/init/btnClick.ts

@@ -1,44 +1,35 @@
+import { getMaterialListReloadApi, getMaterialListExportApi } from "@/api/modules/foundationMaterial";
 import { useMsg } from "@/hooks/useMsg";
-// 直接导出函数，无需额外包装对象
+
-export const handleDel = (item: any, selectionList: any[], proTable: any) => {
+// 导出
-    console.log("导出操作", item);
+export const handleExport = async (params: any) => {
-    console.log(selectionList, "=selectionList=");
+    const { initParam } = params;
-    let length = selectionList.length;
+    const result = await getMaterialListExportApi(initParam);
-    if (!length) {
+    if (result?.code === 0) {
-        useMsg("warning", "请选择需要删除的数据！");
+        useMsg("success", "导出成功请前往导出列表中进行下载！");
-        return;
     }
-    ElMessageBox.confirm("您确定进行删除操作吗?", "温馨提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-    })
-        .then(async () => {
-            proTable.value!.getTableList();
-            // const result = await commitListApi();
-            // if (result.status === 200) {
-            //     useMsg("success", "删除成功 ！");
-            // } else {
-            //     useMsg("error", result.message);
-            // }
-        })
-        .catch(() => {});
 };
-// proTable: any
+//刷新
-export const handleAdd = (item: any, selectionList: any[]) => {
+export const handleReload = async (params: any) => {
-    console.log("刷新操作", item);
+    const { selectionList, proTable } = params;
     let length = selectionList.length;
     let ids: any = [];
     if (length && length > 100) {
-        useMsg("warning", "选中刷新数据最大100条！");
+        useMsg("warning", "选中刷新数据最大100条 ！");
         return;
     }
     selectionList.forEach((item: any) => {
         ids.push(item.id);
     });
+    let id = ids.join(",");
+    const result = await getMaterialListReloadApi({ id });
+    if (result?.code === 0) {
+        useMsg("success", "数据刷新成功 ！");
+        proTable?.value!.getTableList();
+    }
 };
 
 export const btnClick: any = {
-    del: handleDel,
+    export: handleExport,
-    add: handleAdd
+    reset: handleReload
 };

src/views/foundation/set/priority/constant/list/button.ts

@@ -1,7 +0,0 @@
-export const BUTTON = [
-    {
-        text: "导出",
-        permission: "reportManagementBoxInventoryBtnExport",
-        type: "export"
-    }
-];

src/views/foundation/set/priority/constant/list/search.ts

@@ -1,80 +0,0 @@
-interface FormItem {
-    prop: string;
-    label?: string;
-    placeholder?: string;
-    type: string;
-    isCopy?: boolean;
-    optionProps?: any;
-    startPlaceholder?: string;
-    endPlaceholder?: string;
-    options?: any;
-    isArray?: boolean;
-    startDate?: string; //开始时间(传入后台需要的参数)
-    endDate?: string; //结束时间(传入后台需要的参数)
-    startProp?: string;
-    endProp?: string;
-    isInteger?: boolean;
-}
-export const FORM_DATA: FormItem[] = [
-    {
-        prop: "securityNumbers",
-        placeholder: "请输入来源单号",
-        type: "input",
-        isArray: true,
-        label: "来源单号: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择供应商",
-        type: "select",
-        isArray: true,
-        label: "供应商: ",
-        options: []
-    },
-    {
-        prop: "securityNumbers",
-        placeholder: "请输入质检人",
-        type: "input",
-        isArray: true,
-        label: "质检人: "
-    },
-    {
-        prop: "Time",
-        type: "daterange",
-        options: [],
-        startPlaceholder: "质检开始日期",
-        endPlaceholder: "质检结束日期",
-        startDate: "createBeginDate",
-        endDate: "createEndDate",
-        label: "质检时间: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择组织",
-        type: "select",
-        isArray: true,
-        label: "组织: "
-    },
-
-    {
-        prop: "materialNumber",
-        placeholder: "请输入規格型号",
-        type: "selectRemote1",
-        isArray: true,
-        options: [],
-        label: "物料编码: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择质检状态",
-        type: "select",
-        isArray: true,
-        label: "质检状态: "
-    }
-];
-
-export const RULE_FORM = {
-    page: 1,
-    size: 50,
-    orgCode: 0
-};

src/views/foundation/set/priority/constant/list/table.ts

@@ -1,107 +0,0 @@
-export const COLUMNS = [
-    { type: "selection", fixed: "left", width: 40 },
-    {
-        align: "left",
-        fixed: true,
-        label: "质检单",
-        prop: "securityNumber",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检状态",
-        prop: "id",
-        width: 160
-    },
-    {
-        align: "left",
-        label: "销售订单号",
-        prop: "specifications",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "来源单号",
-        prop: "createTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "下载次数",
-        prop: "downLoadNumber",
-        width: 80
-    },
-
-    {
-        align: "left",
-        label: "质检类型",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "供应商",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "组织",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "规格型号",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "物料编码",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "物料名称",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "应质检数量",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "良品数",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "次品数",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检人",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检时间",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "创建时间",
-        prop: "downLoadTime",
-        width: 200
-    }
-];

src/views/foundation/set/priority/index.vue

@@ -1,102 +0,0 @@
-<!-- 质检单 -->
-<template>
-    <div class="table-box">
-        <div style="padding-bottom: 16px">
-            <PermissionButton
-                :buttons="dataStore.buttons"
-                @handleButtonClickCallback="handleButtonClickCallback"
-            ></PermissionButton>
-        </div>
-
-        <ProTable
-            ref="proTable"
-            :formData="dataStore.formData"
-            :columns="dataStore.columns"
-            :request-api="getMaterialListApi"
-            :init-param="dataStore.initParam"
-            @selectionChange="selectionChange"
-            :orgCode="dataStore.ruleForm.orgCode"
-        />
-    </div>
-</template>
-
-<script setup lang="ts" name="foundationSetPriority">
-import ProTable from "@/components/ProTable/index.vue";
-
-// import { useMsg } from "@/hooks/useMsg";
-import PermissionButton from "@/components/PermissionButton/index.vue";
-import { getMaterialListApi } from "@/api/modules/foundationMaterial";
-// import { useAuthStore } from "@/stores/modules/auth";
-
-import { RULE_FORM, FORM_DATA, COLUMNS, BUTTON } from "./constant/list/index";
-//表格TS
-import { ProTableInstance } from "@/components/ProTable/interface";
-import { useUserStore } from "@/stores/modules/user";
-import { btnClick } from "./init";
-//深拷贝方法
-import { cloneDeep } from "lodash-es";
-// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
-const proTable = ref<ProTableInstance>();
-
-// 获取用户信息(组织id)
-const userStore = useUserStore();
-// 数据源
-const dataStore = reactive<any>({
-    columns: COLUMNS, //列表配置项
-    initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件
-    ruleForm: cloneDeep(RULE_FORM), // 搜索条件
-    formData: FORM_DATA, //搜索配置项
-    buttons: cloneDeep(BUTTON),
-    options: [], //规格型号
-    selectionList: [], //选中表格的行
-    loading: false
-});
-
-// 表格选择事件
-const selectionChange = (selection: any) => {
-    dataStore.selectionList = selection;
-};
-const handleButtonClickCallback = (item: any) => {
-    const { type } = item;
-    btnClick[type](item);
-};
-// // 规格型号
-// const remoteMethod1 = async (query: any) => {
-//     datas.loading = true;
-//     if (!query) {
-//         datas.loading = false;
-//         return;
-//     }
-//     let valClone = query.replace(/^\s*|\s*$/g, "");
-//     if (!valClone.length) {
-//         datas.loading = false;
-//         return;
-//     }
-//     const result = await getMaterialListApi(valClone);
-//     if (result.status === 200) {
-//         const { data } = result;
-//         datas.options = data;
-//     }
-//     datas.loading = false;
-// };
-
-watch(
-    () => userStore.orgCode,
-    newVal => {
-        dataStore.ruleForm.orgCode = newVal;
-        dataStore.initParam.orgCode = newVal;
-    },
-    {
-        immediate: true,
-        deep: true
-    }
-);
-</script>
-
-<style scope lang="scss">
-.down-dialog-box {
-    .el-dialog__body {
-        padding: 0 16px 40px;
-    }
-}
-</style>

src/views/foundation/set/priority/init/btnClick.ts

@@ -1,13 +0,0 @@
-// 直接导出函数，无需额外包装对象
-export const handleExport = (item: any) => {
-    console.log("导出操作", item);
-};
-
-export const handleRefresh = (item: any) => {
-    console.log("刷新操作", item);
-};
-
-export const btnClick: any = {
-    export: handleExport,
-    refresh: handleRefresh
-};

src/views/foundation/set/priority/init/index.ts

@@ -1,2 +0,0 @@
-import { btnClick } from "./btnClick";
-export { btnClick };

src/views/foundation/set/relationship/constant/list/button.ts

@@ -1,7 +0,0 @@
-export const BUTTON = [
-    {
-        text: "导出",
-        permission: "reportManagementMaterialBtnExport",
-        type: "export"
-    }
-];

src/views/foundation/set/relationship/constant/list/search.ts

@@ -1,80 +0,0 @@
-interface FormItem {
-    prop: string;
-    label?: string;
-    placeholder?: string;
-    type: string;
-    isCopy?: boolean;
-    optionProps?: any;
-    startPlaceholder?: string;
-    endPlaceholder?: string;
-    options?: any;
-    isArray?: boolean;
-    startDate?: string; //开始时间(传入后台需要的参数)
-    endDate?: string; //结束时间(传入后台需要的参数)
-    startProp?: string;
-    endProp?: string;
-    isInteger?: boolean;
-}
-export const FORM_DATA: FormItem[] = [
-    {
-        prop: "securityNumbers",
-        placeholder: "请输入来源单号",
-        type: "input",
-        isArray: true,
-        label: "来源单号: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择供应商",
-        type: "select",
-        isArray: true,
-        label: "供应商: ",
-        options: []
-    },
-    {
-        prop: "securityNumbers",
-        placeholder: "请输入质检人",
-        type: "input",
-        isArray: true,
-        label: "质检人: "
-    },
-    {
-        prop: "Time",
-        type: "daterange",
-        options: [],
-        startPlaceholder: "质检开始日期",
-        endPlaceholder: "质检结束日期",
-        startDate: "createBeginDate",
-        endDate: "createEndDate",
-        label: "质检时间: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择组织",
-        type: "select",
-        isArray: true,
-        label: "组织: "
-    },
-
-    {
-        prop: "materialNumber",
-        placeholder: "请输入規格型号",
-        type: "selectRemote1",
-        isArray: true,
-        options: [],
-        label: "物料编码: "
-    },
-    {
-        prop: "lotNumbers",
-        placeholder: "请选择质检状态",
-        type: "select",
-        isArray: true,
-        label: "质检状态: "
-    }
-];
-
-export const RULE_FORM = {
-    page: 1,
-    size: 50,
-    orgCode: 0
-};

src/views/foundation/set/relationship/constant/list/table.ts

@@ -1,107 +0,0 @@
-export const COLUMNS = [
-    { type: "selection", fixed: "left", width: 40 },
-    {
-        align: "left",
-        fixed: true,
-        label: "质检单",
-        prop: "securityNumber",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检状态",
-        prop: "id",
-        width: 160
-    },
-    {
-        align: "left",
-        label: "销售订单号",
-        prop: "specifications",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "来源单号",
-        prop: "createTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "下载次数",
-        prop: "downLoadNumber",
-        width: 80
-    },
-
-    {
-        align: "left",
-        label: "质检类型",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "供应商",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "组织",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "规格型号",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "物料编码",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "物料名称",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "应质检数量",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "良品数",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "次品数",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检人",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "质检时间",
-        prop: "downLoadTime",
-        width: 200
-    },
-    {
-        align: "left",
-        label: "创建时间",
-        prop: "downLoadTime",
-        width: 200
-    }
-];

src/views/foundation/set/relationship/index.vue

@@ -1,102 +0,0 @@
-<!-- 质检单 -->
-<template>
-    <div class="table-box">
-        <div style="padding-bottom: 16px">
-            <PermissionButton
-                :buttons="dataStore.buttons"
-                @handleButtonClickCallback="handleButtonClickCallback"
-            ></PermissionButton>
-        </div>
-
-        <ProTable
-            ref="proTable"
-            :formData="dataStore.formData"
-            :columns="dataStore.columns"
-            :request-api="getMaterialListApi"
-            :init-param="dataStore.initParam"
-            @selectionChange="selectionChange"
-            :orgCode="dataStore.ruleForm.orgCode"
-        />
-    </div>
-</template>
-
-<script setup lang="ts" name="foundationSetRelationship">
-import ProTable from "@/components/ProTable/index.vue";
-
-// import { useMsg } from "@/hooks/useMsg";
-import PermissionButton from "@/components/PermissionButton/index.vue";
-import { getMaterialListApi } from "@/api/modules/foundationMaterial";
-// import { useAuthStore } from "@/stores/modules/auth";
-
-import { RULE_FORM, FORM_DATA, COLUMNS, BUTTON } from "./constant/list/index";
-//表格TS
-import { ProTableInstance } from "@/components/ProTable/interface";
-import { useUserStore } from "@/stores/modules/user";
-import { btnClick } from "./init";
-//深拷贝方法
-import { cloneDeep } from "lodash-es";
-// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
-const proTable = ref<ProTableInstance>();
-
-// 获取用户信息(组织id)
-const userStore = useUserStore();
-// 数据源
-const dataStore = reactive<any>({
-    columns: COLUMNS, //列表配置项
-    initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件
-    ruleForm: cloneDeep(RULE_FORM), // 搜索条件
-    formData: FORM_DATA, //搜索配置项
-    buttons: cloneDeep(BUTTON),
-    options: [], //规格型号
-    selectionList: [], //选中表格的行
-    loading: false
-});
-
-// 表格选择事件
-const selectionChange = (selection: any) => {
-    dataStore.selectionList = selection;
-};
-const handleButtonClickCallback = (item: any) => {
-    const { type } = item;
-    btnClick[type](item);
-};
-// // 规格型号
-// const remoteMethod1 = async (query: any) => {
-//     datas.loading = true;
-//     if (!query) {
-//         datas.loading = false;
-//         return;
-//     }
-//     let valClone = query.replace(/^\s*|\s*$/g, "");
-//     if (!valClone.length) {
-//         datas.loading = false;
-//         return;
-//     }
-//     const result = await getMaterialListApi(valClone);
-//     if (result.status === 200) {
-//         const { data } = result;
-//         datas.options = data;
-//     }
-//     datas.loading = false;
-// };
-
-watch(
-    () => userStore.orgCode,
-    newVal => {
-        dataStore.ruleForm.orgCode = newVal;
-        dataStore.initParam.orgCode = newVal;
-    },
-    {
-        immediate: true,
-        deep: true
-    }
-);
-</script>
-
-<style scope lang="scss">
-.down-dialog-box {
-    .el-dialog__body {
-        padding: 0 16px 40px;
-    }
-}
-</style>

src/views/foundation/set/relationship/init/btnClick.ts

@@ -1,13 +0,0 @@
-// 直接导出函数，无需额外包装对象
-export const handleExport = (item: any) => {
-    console.log("导出操作", item);
-};
-
-export const handleRefresh = (item: any) => {
-    console.log("刷新操作", item);
-};
-
-export const btnClick: any = {
-    export: handleExport,
-    refresh: handleRefresh
-};

src/views/foundation/set/relationship/init/index.ts

@@ -1,2 +0,0 @@
-import { btnClick } from "./btnClick";
-export { btnClick };

src/views/foundation/set/shop/constant/list/button.ts

@@ -0,0 +1,23 @@
+export const BUTTON = [
+    {
+        text: "新增",
+        permission: "foundationSetShopBtnAdd",
+        type: "add",
+        props: {
+            type: "primary"
+        }
+    },
+    {
+        text: "导出",
+        permission: "foundationSetShopBtnExport",
+        type: "export"
+        // props: {
+        //     type: "primary"
+        // }
+    },
+    {
+        text: "删除",
+        permission: "foundationSetShopBtnDel",
+        type: "del"
+    }
+];

src/views/foundation/set/shop/constant/list/details.ts

@@ -0,0 +1,173 @@
+export const DETAILS_FORM_DATA: any[] = [
+    {
+        prop: "platform_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "平台:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "platform_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "平台店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "access_system",
+        placeholder: "请选择",
+        type: "select",
+        label: "订单接入系统:",
+        disabled: false,
+        required: true,
+        options: [],
+        class: "form-item1"
+    },
+    {
+        prop: "kingdee_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "金蝶店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "kingdee_store_number",
+        placeholder: "请输入",
+        type: "input",
+        label: "金蝶店铺编码:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    }
+];
+
+export const DETAILS_FORM_DATA1: any[] = [
+    {
+        prop: "platform_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "平台:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "platform_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "平台店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "access_system",
+        placeholder: "请输入",
+        type: "select",
+        label: "订单接入系统:",
+        disabled: false,
+        required: true,
+        options: [],
+        class: "form-item1"
+    },
+    {
+        prop: "kingdee_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "金蝶店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "kingdee_store_number",
+        placeholder: "请输入",
+        type: "input",
+        label: "金蝶店铺编码:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "jushuitan_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "聚水潭店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    }
+];
+export const DETAILS_FORM_DATA2: any[] = [
+    {
+        prop: "platform_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "平台:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "platform_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "平台店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "access_system",
+        placeholder: "请输入",
+        type: "select",
+        label: "订单接入系统:",
+        disabled: false,
+        required: true,
+        options: [],
+        class: "form-item1"
+    },
+    {
+        prop: "kingdee_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "金蝶店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "kingdee_store_number",
+        placeholder: "请输入",
+        type: "input",
+        label: "金蝶店铺编码:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "lingxing_store_name",
+        placeholder: "请输入",
+        type: "input",
+        label: "领星店铺名称:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    },
+    {
+        prop: "lingxing_store_number",
+        placeholder: "请输入",
+        type: "input",
+        label: "领星店铺SellerID:",
+        disabled: false,
+        required: true,
+        class: "form-item1"
+    }
+];
+export const DETAILS_RULE_FORM: any = {};

src/views/foundation/set/shop/constant/list/search.ts

@@ -0,0 +1,70 @@
+interface FormItem {
+    prop: string;
+    label?: string;
+    placeholder?: string;
+    type: string;
+    isCopy?: boolean;
+    optionProps?: any;
+    startPlaceholder?: string;
+    endPlaceholder?: string;
+    options?: any;
+    isArray?: boolean;
+    startDate?: string; //开始时间(传入后台需要的参数)
+    endDate?: string; //结束时间(传入后台需要的参数)
+    startProp?: string;
+    endProp?: string;
+    isInteger?: boolean;
+}
+export const FORM_DATA: FormItem[] = [
+    {
+        prop: "platform_name",
+        placeholder: "请输入平台",
+        type: "input",
+        label: "平台: "
+    },
+    {
+        prop: "platform_store_name",
+        placeholder: "请输入平台店铺名称",
+        type: "input",
+        label: "平台店铺名称: "
+    },
+    {
+        prop: "kingdee_store_name",
+        placeholder: "请输入金蝶店铺名称",
+        type: "input",
+        label: "金蝶店铺名称: "
+    },
+    {
+        prop: "jushuitan_store_name",
+        placeholder: "请输入聚水潭店铺名称",
+        type: "input",
+        label: "聚水潭店铺名称: "
+    },
+    {
+        prop: "lingxing_store_name",
+        placeholder: "请输入领星店铺名称",
+        type: "input",
+        label: "领星店铺名称: "
+    },
+    {
+        prop: "operator_name",
+        placeholder: "请输入更新人",
+        type: "input",
+        label: "更新人: "
+    },
+    {
+        prop: "Time",
+        type: "daterange",
+        options: [],
+        startPlaceholder: "更新开始日期",
+        endPlaceholder: "更新结束日期",
+        startDate: "update_time",
+        // endDate: "createEndDate",
+        label: "更新时间: "
+    }
+];
+
+export const RULE_FORM = {
+    page: 1,
+    size: 50
+};

src/views/foundation/set/shop/constant/list/table.ts

@@ -0,0 +1,59 @@
+// import { RenderScope } from "@/components/ProTable/interface";
+export const COLUMNS = [
+    { type: "selection", fixed: "left", width: 40 },
+    {
+        align: "left",
+        fixed: true,
+        label: "平台店铺名称",
+        prop: "platform_store_name",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "平台",
+        prop: "platform_name",
+        fixed: true
+    },
+    {
+        align: "left",
+        label: "订单接入系统",
+        prop: "access_system_name"
+    },
+    {
+        align: "left",
+        label: "聚水潭店铺名称",
+        prop: "jushuitan_store_name"
+    },
+    {
+        align: "left",
+        label: "领星店铺名称",
+        prop: "lingxing_store_name"
+    },
+    {
+        align: "left",
+        label: "领星店铺SellerID",
+        prop: "lingxing_store_number"
+    },
+
+    {
+        align: "left",
+        label: "金蝶店铺名称",
+        prop: "kingdee_store_name"
+    },
+
+    {
+        align: "left",
+        label: "金蝶店铺编码",
+        prop: "kingdee_store_number"
+    },
+    {
+        align: "left",
+        label: "更新人",
+        prop: "operator"
+    },
+    {
+        align: "left",
+        label: "更新时间",
+        prop: "updated_at"
+    }
+];

src/views/foundation/set/shop/index.vue

@@ -0,0 +1,291 @@
+<!-- 店铺资料 -->
+<template>
+    <div class="table-box">
+        <div style="padding-bottom: 16px">
+            <PermissionButton
+                :buttons="dataStore.buttons"
+                @handleButtonClickCallback="handleButtonClickCallback"
+            ></PermissionButton>
+        </div>
+        <el-dialog v-model="dataStore.dialogVisible" width="660" :before-close="handleClose" :title="dataStore.title">
+            <DetailsSearch
+                :formData="dataStore.detailsFormData"
+                :ruleForm="dataStore.detailsRuleForm"
+                :labelWidth="dataStore.labelWidth"
+                :inline="true"
+                :isSearch="true"
+                ref="detailsRef"
+            />
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="handleClose">取消</el-button>
+                    <el-button type="primary" @click="handleCommit"> 确认 </el-button>
+                </div>
+            </template>
+        </el-dialog>
+        <ProTable
+            ref="proTableRef"
+            :columns="dataStore.columns"
+            :request-api="getShopListApi"
+            :init-param="dataStore.initParam"
+            @selectionChange="selectionChange"
+        >
+            <template v-slot:search>
+                <SearchForm
+                    @search="handleSearch"
+                    @reset="handleReset"
+                    :searchParams="dataStore.initParam"
+                    :formData="dataStore.formData"
+                />
+            </template>
+            <template #platform_store_name="scope">
+                <a @click="handleOpen(scope.row)" class="break-word to-details">
+                    {{ scope.row.platform_store_name }}
+                </a>
+            </template>
+        </ProTable>
+    </div>
+</template>
+
+<script setup lang="ts" name="foundationSetShop">
+import ProTable from "@/components/ProTable/index.vue";
+import SearchForm from "@/components/SearchForm/index.vue";
+import PermissionButton from "@/components/PermissionButton/index.vue";
+import {
+    getShopListApi,
+    getShopDelApi,
+    getShopAccessSystemApi,
+    getShopAddApi,
+    getShopUpApi,
+    getShopDetailsApi,
+    getShopListExportApi
+} from "@/api/modules/shop";
+import { useMsg } from "@/hooks/useMsg";
+import { RULE_FORM, FORM_DATA, COLUMNS, BUTTON } from "./constant/list/index";
+import { DETAILS_RULE_FORM, DETAILS_FORM_DATA, DETAILS_FORM_DATA1, DETAILS_FORM_DATA2 } from "./constant/list/details";
+// 表格TS
+import { ProTableInstance } from "@/components/ProTable/interface";
+
+// 深拷贝方法
+import { cloneDeep } from "lodash-es";
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTableRef = ref<ProTableInstance>();
+const detailsRef = ref<any>(null);
+// 数据源
+const dataStore = reactive<any>({
+    columns: COLUMNS, //列表配置项
+    initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件
+    formData: FORM_DATA, // 搜索配置项
+    buttons: cloneDeep(BUTTON),
+    labelWidth: "120px",
+    title: "新增店铺",
+    detailsFormData: cloneDeep(DETAILS_FORM_DATA),
+    detailsRuleForm: cloneDeep(DETAILS_RULE_FORM),
+    dialogVisible: false, // 弹窗
+    accessSystemOptions: [], // 接入系統列表
+    selectionList: [] // 列表选中数据
+});
+
+// 表格选择事件
+const selectionChange = (selection: any) => {
+    dataStore.selectionList = selection;
+};
+// 删除
+const handleDel = () => {
+    if (!dataStore.selectionList.length) {
+        useMsg("warning", "请选择数据 ！");
+        return;
+    } else {
+        ElMessageBox.confirm("您确定进行删除操作吗?", "温馨提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+        })
+            .then(async () => {
+                let ids: any = [];
+                dataStore.selectionList?.forEach((item: any) => {
+                    ids.push(item.id);
+                });
+
+                const result = await getShopDelApi(ids.join(","));
+
+                if (result?.code === 0) {
+                    proTableRef?.value!.getTableList();
+                    useMsg("success", "删除成功 ！");
+                }
+            })
+            .catch(() => {});
+    }
+};
+// 新增
+const getShopAdd = async () => {
+    const result = await getShopAddApi(dataStore.detailsRuleForm);
+    if (result?.code === 0) {
+        useMsg("success", "新增成功 ！");
+        setTimeout(() => {
+            dataStore.dialogVisible = false;
+            proTableRef?.value!.getTableList();
+        }, 600);
+    }
+};
+// 更新
+const getShopUp = async () => {
+    const result = await getShopUpApi(dataStore.rowId, dataStore.detailsRuleForm);
+    if (result?.code === 0) {
+        useMsg("success", "更新成功 ！");
+        setTimeout(() => {
+            dataStore.dialogVisible = false;
+            proTableRef?.value!.getTableList();
+        }, 600);
+    }
+};
+// 详情
+const getShopDetails = async (id: any) => {
+    const result = await getShopDetailsApi(id);
+    if (result?.code === 0) {
+        dataStore.dialogVisible = true;
+        dataStore.title = "编辑店铺";
+        setAccessSystem(result?.data?.access_system);
+        dataStore.detailsRuleForm = result?.data;
+    }
+};
+// 表格row点击事件
+const handleOpen = (row: any) => {
+    dataStore.rowId = row.id;
+    getShopDetails(row.id);
+};
+// 獲取接入系統列表數據
+const getShopAccessSystem = async () => {
+    const result = await getShopAccessSystemApi();
+    if (result?.code === 0) {
+        let data = cloneDeep(result?.data);
+        let options = [];
+
+        data?.length &&
+            data.forEach((item: any) => {
+                options.push({ value: item.id, label: item.name, is_default: item.is_default });
+            });
+        dataStore.accessSystemOptions = options;
+        dataStore.detailsFormData[2].options = options;
+    }
+};
+getShopAccessSystem();
+// 导出
+const handleExport = async () => {
+    const result = await getShopListExportApi(dataStore.initParam);
+    if (result?.code === 0) {
+        useMsg("success", "导出成功请前往导出列表中进行下载 ！");
+    }
+};
+// 顶部按钮点击事件
+const handleButtonClickCallback = (item: any) => {
+    const { type } = item;
+    if (type === "del") {
+        return handleDel();
+    }
+    if (type === "export") {
+        return handleExport();
+    }
+    if (type === "add") {
+        dataStore.title = "新增店铺";
+        dataStore.dialogVisible = true;
+    }
+};
+// 弹窗取消
+const handleClose = () => {
+    dataStore.detailsRuleForm = cloneDeep(DETAILS_RULE_FORM);
+    detailsRef?.value?.formElement?.resetFields();
+    dataStore.dialogVisible = false;
+};
+
+// 弹窗确认
+const handleCommit = () => {
+    if (!dataStore.detailsRuleForm.platform_name) {
+        useMsg("warning", "平台不能为空 !");
+        return false;
+    }
+    if (!dataStore.detailsRuleForm.platform_store_name) {
+        useMsg("warning", "平台店铺名称不能为空 !");
+        return false;
+    }
+    if (!dataStore.detailsRuleForm.access_system) {
+        useMsg("warning", "订单接入系统不能为空 !");
+        return false;
+    }
+    if (!dataStore.detailsRuleForm.kingdee_store_name) {
+        useMsg("warning", "金蝶店铺名称不能为空 !");
+        return false;
+    }
+    if (!dataStore.detailsRuleForm.kingdee_store_number) {
+        useMsg("warning", "金蝶店铺编码不能为空 !");
+        return false;
+    }
+    if (dataStore.detailsRuleForm.access_system === 2 && !dataStore.detailsRuleForm.jushuitan_store_name) {
+        useMsg("warning", "聚水潭店铺名称不能为空 !");
+        return false;
+    }
+    if (dataStore.detailsRuleForm.access_system === 3 && !dataStore.detailsRuleForm.lingxing_store_name) {
+        useMsg("warning", "领星店铺名称不能为空 !");
+        return false;
+    }
+    if (dataStore.detailsRuleForm.access_system === 3 && !dataStore.detailsRuleForm.lingxing_store_number) {
+        useMsg("warning", "领星店铺SellerID不能为空 !");
+        return false;
+    }
+
+    if (dataStore.title === "新增店铺") {
+        getShopAdd();
+    } else {
+        getShopUp();
+    }
+};
+// 搜索
+const handleSearch = async (params: any) => {
+    console.log(params, "==============>");
+    dataStore.initParam = cloneDeep(params);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
+// 重置
+const handleReset = () => {
+    dataStore.initParam = cloneDeep(RULE_FORM);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
+// 接入系统切换
+const setAccessSystem = (val: any) => {
+    if (val === 2) {
+        dataStore.detailsFormData = cloneDeep(DETAILS_FORM_DATA1);
+        dataStore.detailsFormData[2].options = cloneDeep(dataStore.accessSystemOptions);
+        dataStore.detailsRuleForm.lingxing_store_name = "";
+        dataStore.lingxing_store_number = "";
+    }
+    if (val === 3) {
+        dataStore.detailsFormData = cloneDeep(DETAILS_FORM_DATA2);
+        dataStore.detailsFormData[2].options = cloneDeep(dataStore.accessSystemOptions);
+        dataStore.detailsRuleForm.jushuitan_store_name = "";
+    }
+};
+watch(
+    () => dataStore.detailsRuleForm.access_system,
+    (newVal: any) => {
+        setAccessSystem(newVal);
+    }
+);
+</script>
+
+<style scope lang="scss">
+.down-dialog-box {
+    .el-dialog__body {
+        padding: 0 16px 40px;
+    }
+}
+.el-dialog .el-dialog__header {
+    padding: 8px 0;
+    font-weight: bold;
+}
+</style>

src/views/foundation/set/warehouse/constant/list/button.ts

@@ -0,0 +1,16 @@
+export const BUTTON = [
+    {
+        text: "新增",
+        permission: "foundationSetWarehouseBtnAdd",
+        type: "add",
+        props: {
+            type: "primary"
+        }
+    },
+
+    {
+        text: "删除",
+        permission: "foundationSetWarehouseBtnDel",
+        type: "del"
+    }
+];

src/views/foundation/set/warehouse/constant/list/details.ts

@@ -0,0 +1,63 @@
+export const DETAILS_FORM_DATA: any[] = [
+    {
+        prop: "use_org_number",
+        placeholder: "请输入",
+        type: "selectMultipleD",
+        label: "组织:",
+        disabled: false,
+        required: true,
+        class: "form-item1",
+        options: []
+    },
+    {
+        prop: "kd_warehouse_number",
+        placeholder: "请选择",
+        type: "selectMultipleD",
+        label: "金蝶仓库:",
+        disabled: false,
+        required: true,
+        class: "form-item1",
+        options: []
+    },
+    {
+        prop: "kd_subwarehouse",
+        placeholder: "请选择",
+        type: "selectMultiples",
+        label: "金蝶子仓库:",
+        disabled: false,
+        class: "form-item1",
+        options: []
+    },
+    {
+        prop: "jst_warehouse_number",
+        placeholder: "请选择",
+        type: "select",
+        label: "对应聚水潭仓库:",
+        disabled: false,
+        class: "form-item1",
+        options: []
+    },
+    {
+        prop: "lx_warehouse_number",
+        placeholder: "请选择",
+        type: "select",
+        label: "对应领星仓库:",
+        disabled: false,
+        class: "form-item1",
+        options: []
+    },
+    {
+        //textarea
+
+        prop: "remark",
+        placeholder: "请输入",
+        type: "textarea",
+        label: "备注:",
+        disabled: false,
+        maxLength: 5000,
+        class: "form-item1"
+    }
+];
+export const DETAILS_RULE_FORM: any = {
+    use_org_number: "101"
+};

src/views/foundation/set/warehouse/constant/list/search.ts

@@ -0,0 +1,63 @@
+interface FormItem {
+    prop: string;
+    label?: string;
+    placeholder?: string;
+    type: string;
+    isCopy?: boolean;
+    optionProps?: any;
+    startPlaceholder?: string;
+    endPlaceholder?: string;
+    options?: any;
+    isArray?: boolean;
+    startDate?: string; //开始时间(传入后台需要的参数)
+    endDate?: string; //结束时间(传入后台需要的参数)
+    startProp?: string;
+    endProp?: string;
+    isInteger?: boolean;
+}
+export const FORM_DATA: FormItem[] = [
+    {
+        prop: "use_org_number",
+        placeholder: "请选择组织",
+        type: "selectMultiple",
+        label: "组织: ",
+        options: []
+    },
+    {
+        prop: "kd_warehouse_number",
+        placeholder: "请输入金蝶仓库",
+        type: "selectRemoteKD",
+        label: "金蝶仓库: ",
+        options: []
+    },
+    {
+        prop: "kd_subwarehouse",
+        placeholder: "请输入金蝶子仓库",
+        type: "selectRemoteKDSubwarehouse",
+        label: "金蝶子仓库: ",
+        options: []
+    },
+    {
+        prop: "operator_name",
+        placeholder: "请输入更新人",
+        type: "input",
+        label: "更新人: "
+    },
+
+    {
+        prop: "Time",
+        type: "daterange",
+        options: [],
+        startPlaceholder: "更新开始日期",
+        endPlaceholder: "更新结束日期",
+        startDate: "update_time",
+        // endDate: "createEndDate",
+        label: "更新时间: "
+    }
+];
+
+export const RULE_FORM = {
+    page: 1,
+    size: 50,
+    use_org_number: ["101"]
+};

src/views/foundation/set/warehouse/constant/list/table.ts

@@ -0,0 +1,48 @@
+// import { RenderScope } from "@/components/ProTable/interface";
+export const COLUMNS = [
+    { type: "selection", fixed: "left", width: 40 },
+    {
+        align: "left",
+        fixed: true,
+        label: "金蝶仓库",
+        prop: "kd_warehouse_name",
+        width: 200
+    },
+    {
+        align: "left",
+        fixed: true,
+        label: "组织",
+        prop: "use_org_name",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "金蝶子仓库",
+        prop: "kd_subwarehouse",
+        fixed: true,
+        width: 200
+    },
+    {
+        align: "left",
+        label: "对应聚水潭仓库",
+        prop: "jst_warehouse_name",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "对应领星仓库",
+        prop: "lx_warehouse_name",
+        width: 200
+    },
+    {
+        align: "left",
+        label: "更新人",
+        prop: "creator"
+    },
+
+    {
+        align: "left",
+        label: "更新时间",
+        prop: "created_at"
+    }
+];

src/views/foundation/set/warehouse/index.vue

@@ -0,0 +1,441 @@
+<!-- 店铺资料 -->
+<template>
+    <div class="table-box">
+        <div style="padding-bottom: 16px">
+            <PermissionButton
+                :buttons="dataStore.buttons"
+                @handleButtonClickCallback="handleButtonClickCallback"
+            ></PermissionButton>
+        </div>
+        <el-dialog v-model="dataStore.dialogVisible" width="660" :before-close="handleClose" :title="dataStore.title">
+            <DetailsSearch
+                :formData="dataStore.detailsFormData"
+                :ruleForm="dataStore.detailsRuleForm"
+                :labelWidth="dataStore.labelWidth"
+                :inline="true"
+                :isSearch="true"
+                @selectMultipleDClear="handleSelectMultipleDClear"
+                ref="detailsRef"
+            />
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="handleClose">取消</el-button>
+                    <el-button type="primary" @click="handleCommit"> 确认 </el-button>
+                </div>
+            </template>
+        </el-dialog>
+        <ProTable
+            ref="proTableRef"
+            :columns="dataStore.columns"
+            :request-api="getSetWarehouseListApi"
+            :init-param="dataStore.initParam"
+            @selectionChange="selectionChange"
+        >
+            <template v-slot:search>
+                <SearchForm
+                    @search="handleSearch"
+                    @reset="handleReset"
+                    :searchParams="dataStore.initParam"
+                    :formData="dataStore.formData"
+                    @selectMultipleRemoveTag="handleSelectMultipleRemoveTag"
+                />
+            </template>
+            <template #platform_store_name="scope">
+                <a @click="handleOpen(scope.row)" class="break-word to-details">
+                    {{ scope.row.platform_store_name }}
+                </a>
+            </template>
+        </ProTable>
+    </div>
+</template>
+
+<script setup lang="ts" name="foundationSetWarehouse">
+import ProTable from "@/components/ProTable/index.vue";
+import SearchForm from "@/components/SearchForm/index.vue";
+import PermissionButton from "@/components/PermissionButton/index.vue";
+
+import { useUserStore } from "@/stores/modules/user";
+import {
+    getSetWarehouseListApi,
+    getWarehouseDelApi,
+    getWarehouseAddApi,
+    getWarehouseUpApi,
+    getWarehouseDetailsApi,
+    getSetWarehouseKingdeeListApi,
+    getSetWarehouseSubwarehousesListApi,
+    getSetWarehouseSubwarehousesLingXingListApi,
+    getSetWarehouseSubwarehousesJushuitanListApi
+} from "@/api/modules/setWarehouse";
+import { useMsg } from "@/hooks/useMsg";
+import { RULE_FORM, FORM_DATA, COLUMNS, BUTTON } from "./constant/list/index";
+import { DETAILS_RULE_FORM, DETAILS_FORM_DATA } from "./constant/list/details";
+// 表格TS
+import { ProTableInstance } from "@/components/ProTable/interface";
+
+// 深拷贝方法
+import { cloneDeep } from "lodash-es";
+// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
+const proTableRef = ref<ProTableInstance>();
+const detailsRef = ref<any>(null);
+// 数据源
+const dataStore = reactive<any>({
+    columns: COLUMNS, //列表配置项
+    initParam: cloneDeep(RULE_FORM), // 初始化搜索条件|重置搜索条件
+    formData: FORM_DATA, // 搜索配置项
+    buttons: cloneDeep(BUTTON),
+    labelWidth: "120px",
+    title: "新增金蝶子仓与各系统仓库关系",
+    detailsFormData: cloneDeep(DETAILS_FORM_DATA),
+    detailsRuleForm: cloneDeep(DETAILS_RULE_FORM),
+    dialogVisible: false, // 弹窗
+    selectionList: [] // 列表选中数据
+});
+const userStore = useUserStore();
+//初始化组织数据
+const init = () => {
+    if (userStore.orgIdArr.length) {
+        dataStore.formData[0].options = userStore?.orgIdArr;
+        dataStore.detailsFormData[0].options = userStore?.orgIdArr;
+    }
+};
+init();
+// 表格选择事件
+const selectionChange = (selection: any) => {
+    dataStore.selectionList = selection;
+};
+// 删除
+const handleDel = () => {
+    if (!dataStore.selectionList.length) {
+        useMsg("warning", "请选择数据 ！");
+        return;
+    } else {
+        ElMessageBox.confirm("您确定进行删除操作吗?", "温馨提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+        })
+            .then(async () => {
+                let ids: any = [];
+                dataStore.selectionList?.forEach((item: any) => {
+                    ids.push(item.id);
+                });
+                const result = await getWarehouseDelApi(ids.join(","));
+                if (result?.code === 0) {
+                    proTableRef?.value!.getTableList();
+                    useMsg("success", "删除成功 ！");
+                }
+            })
+            .catch(() => {});
+    }
+};
+// 新增
+const getWarehouseAdd = async (params: any) => {
+    const result = await getWarehouseAddApi(params);
+    if (result?.code === 0) {
+        useMsg("success", "新增成功 ！");
+        setTimeout(() => {
+            dataStore.dialogVisible = false;
+            proTableRef?.value!.getTableList();
+        }, 600);
+    }
+};
+// 更新
+const getWarehouseUp = async (params: any) => {
+    const result = await getWarehouseUpApi(dataStore.rowId, params);
+    if (result?.code === 0) {
+        useMsg("success", "更新成功 ！");
+        setTimeout(() => {
+            dataStore.dialogVisible = false;
+            proTableRef?.value!.getTableList();
+        }, 600);
+    }
+};
+// 详情
+const getWarehouseDetails = async (id: any) => {
+    const result = await getWarehouseDetailsApi(id);
+    if (result?.code === 0) {
+        dataStore.dialogVisible = true;
+        dataStore.title = "编辑金蝶子仓与各系统仓库关系";
+        setAccessSystem(result?.data?.access_system);
+        dataStore.detailsRuleForm = result?.data;
+    }
+};
+//获取金蝶仓库
+const getSetWarehouseKingdeeList = async () => {
+    dataStore.detailsFormData[1].options = [];
+    const result = await getSetWarehouseKingdeeListApi({ use_org_number: dataStore.detailsRuleForm.use_org_number });
+    if (result?.code === 0) {
+        let options: any = [];
+        result?.data?.forEach((item: any) => {
+            options.push({
+                label: item.warehouse_name,
+                value: item.warehouse_number
+            });
+        });
+        dataStore.detailsFormData[1].options = options;
+    }
+};
+//获取金蝶子仓库
+const getSetWarehouseSubwarehousesList = async () => {
+    //先清空一下
+    dataStore.detailsFormData[2].options = [];
+    const result = await getSetWarehouseSubwarehousesListApi({
+        warehouse_number: dataStore.detailsRuleForm.kd_warehouse_number
+    });
+    if (result?.code === 0) {
+        let options: any = [];
+        result?.data?.forEach((item: any) => {
+            options.push({
+                label: item.sub_warehouse_name,
+                value: item.sub_warehouse_number
+            });
+        });
+        dataStore.detailsFormData[2].options = options;
+    }
+};
+
+//获取领星仓库
+const getSetWarehouseSubwarehousesLingXingList = async () => {
+    const result = await getSetWarehouseSubwarehousesLingXingListApi();
+    if (result?.code === 0) {
+        let options: any = [];
+        result?.data?.forEach((item: any) => {
+            options.push({
+                label: item.warehouse_name,
+                value: item.warehouse_number + ""
+            });
+        });
+        dataStore.detailsFormData[4].options = options;
+    }
+};
+//获取聚水潭仓库
+const getSetWarehouseSubwarehousesJushuitanList = async () => {
+    const result = await getSetWarehouseSubwarehousesJushuitanListApi();
+    if (result?.code === 0) {
+        let options: any = [];
+        result?.data?.forEach((item: any) => {
+            options.push({
+                label: item.warehouse_name,
+                value: item.warehouse_number + ""
+            });
+        });
+        dataStore.detailsFormData[3].options = options;
+    }
+};
+// 表格row点击事件
+const handleOpen = (row: any) => {
+    dataStore.rowId = row.id;
+    getWarehouseDetails(row.id);
+};
+
+// 顶部按钮点击事件
+const handleButtonClickCallback = (item: any) => {
+    const { type } = item;
+    if (type === "del") {
+        return handleDel();
+    }
+    if (type === "export") {
+        return handleExport();
+    }
+    if (type === "add") {
+        dataStore.title = "新增金蝶子仓与各系统仓库关系";
+        dataStore.dialogVisible = true;
+    }
+};
+// 弹窗取消
+const handleClose = () => {
+    dataStore.detailsRuleForm = cloneDeep(DETAILS_RULE_FORM);
+    detailsRef?.value?.formElement?.resetFields();
+    dataStore.dialogVisible = false;
+};
+
+// 弹窗确认
+const handleCommit = () => {
+    let params = cloneDeep(dataStore.detailsRuleForm);
+    if (!params.use_org_number) {
+        return useMsg("warning", "组织不能为空 !");
+    }
+    if (!params.kd_warehouse_number) {
+        return useMsg("warning", "金蝶仓库不能为空 !");
+    }
+    //将金蝶子仓库转换为字符串
+    let kd_subwarehouse = params.kd_subwarehouse;
+    if (Array.isArray(kd_subwarehouse) && kd_subwarehouse.length) {
+        params.kd_subwarehouse = kd_subwarehouse.join(",");
+    }
+
+    if (dataStore.title === "新增金蝶子仓与各系统仓库关系") {
+        getWarehouseAdd(params);
+    } else {
+        getWarehouseUp(params);
+    }
+};
+// 搜索
+const handleSearch = async (params: any) => {
+    dataStore.initParam = cloneDeep(params);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
+// 重置
+const handleReset = () => {
+    dataStore.initParam = cloneDeep(RULE_FORM);
+    //这里需要等到表格刷新以后才去请求
+    nextTick(() => {
+        proTableRef?.value!.getTableList();
+    });
+};
+//监听组织和金蝶仓库清空按钮(会触发下面的watch)
+const handleSelectMultipleDClear = (params: any) => {
+    const {
+        item: { prop }
+    } = params;
+    dataStore.detailsRuleForm[prop] = "";
+};
+/**
+ * 监听查询条件标签关闭（统一处理组织、仓库、子仓库联动，修复split类型错误）
+ * @param params { item: { prop: string } } - 关闭标签的相关参数（包含字段标识prop）
+ */
+const handleSelectMultipleRemoveTag = (params: any) => {
+    const { item } = params;
+    const { prop } = item;
+    const paramValue = dataStore.initParam[prop]; // 获取当前参数值
+    console.log(paramValue, "=============");
+    // // 核心：兼容多种参数类型，解析为「去重数组」（容错处理）
+    // let remainingValues: string[] = [];
+    // if (typeof paramValue === "string" && paramValue.trim()) {
+    //     // 情况1：参数是有效字符串 → 分割为数组
+    //     remainingValues = Array.from(new Set(paramValue.split(",").filter(val => val.trim())));
+    // } else if (Array.isArray(paramValue)) {
+    //     // 情况2：参数是数组 → 直接去重
+    //     remainingValues = Array.from(new Set(paramValue.filter(val => val && val.trim())));
+    // } else {
+    //     // 情况3：参数是undefined/null/空值 → 空数组
+    //     remainingValues = [];
+    // }
+
+    // 根据字段标识分发处理逻辑
+    switch (prop) {
+        case "use_org_number":
+            handleOrgTagRemove(paramValue);
+            break;
+        case "kd_warehouse_number":
+            handleKdWarehouseTagRemove(paramValue);
+            break;
+        case "kd_subwarehouse":
+            handleKdSubWarehouseTagRemove(paramValue);
+            break;
+        default:
+            break;
+    }
+};
+
+/**
+ * 组织标签关闭处理（联动仓库、子仓库）
+ * @param remainingOrgValues 关闭后剩余的组织value数组（如：["101"]、["101","115"]）
+ */
+const handleOrgTagRemove = (remainingOrgValues: any[]) => {
+    // 2. 筛选仓库：基于原始金蝶仓库数据，聚合所有剩余组织对应的仓库（去重）
+    let filteredWarehouses = [];
+    if (remainingOrgValues.length > 0) {
+        filteredWarehouses = dataStore.formData[1].options.filter(warehouse =>
+            remainingOrgValues.includes(warehouse.use_org_number)
+        );
+        // 去重：避免同一仓库被多个组织关联导致重复
+        filteredWarehouses = Array.from(new Map(filteredWarehouses.map(item => [item.value, item])).values());
+    }
+
+    // 3. 重置仓库状态（清空已选+更新选项）
+    dataStore.initParam.kd_warehouse_number = "";
+    dataStore.formData[1].options = [];
+    dataStore.formData[1].options = filteredWarehouses;
+
+    // 4. 重置子仓库状态（仓库变化后必须清空）
+    dataStore.initParam.kd_subwarehouse = "";
+    dataStore.formData[2].options = [];
+};
+
+/**
+ * 金蝶仓库标签关闭处理（联动子仓库）
+ * @param remainingWarehouseValues 关闭后剩余的仓库value数组（如：["AD"]、["AD","CK001"]）
+ */
+const handleKdWarehouseTagRemove = (remainingWarehouseValues: any[]) => {
+    // 2. 筛选子仓库：基于原始金蝶子仓库数据，聚合所有剩余仓库对应的子仓库
+    let filteredSubWarehouses = [];
+    if (remainingWarehouseValues.length > 0) {
+        filteredSubWarehouses = dataStore.formData[2].options.filter(subWarehouse =>
+            remainingWarehouseValues.includes(subWarehouse.warehouse_number)
+        );
+    } else {
+        // 仓库全部关闭：显示所有原始子仓库数据
+        filteredSubWarehouses = [...dataStore.formData[2].options];
+    }
+
+    // 3. 重置子仓库状态（清空已选+更新选项）
+    dataStore.initParam.kd_subwarehouse = "";
+    dataStore.formData[2].options = [];
+    dataStore.formData[2].options = filteredSubWarehouses;
+};
+
+/**
+ * 金蝶子仓库标签关闭处理（仅更新自身，不联动上级）
+ * @param remainingSubWarehouseValues 关闭后剩余的子仓库value数组
+ */
+const handleKdSubWarehouseTagRemove = (remainingSubWarehouseValues: any[]) => {
+    // 同步表单已选值
+    dataStore.formData[2].options = remainingSubWarehouseValues;
+};
+// //监听弹窗开启
+watch(
+    () => dataStore.dialogVisible,
+    (newVal: any) => {
+        if (newVal) {
+            getSetWarehouseKingdeeList();
+            getSetWarehouseSubwarehousesLingXingList();
+            getSetWarehouseSubwarehousesJushuitanList();
+        }
+    },
+    {
+        deep: true
+    }
+);
+//监听组织值改变(值改变关联关系需重置)
+watch(
+    () => dataStore.detailsRuleForm.use_org_number,
+    (newVal: any) => {
+        if (newVal) {
+            dataStore.detailsRuleForm.kd_warehouse_number = "";
+            dataStore.detailsRuleForm.kd_subwarehouse = "";
+            getSetWarehouseKingdeeList();
+        } else {
+            dataStore.detailsRuleForm.kd_warehouse_number = "";
+            dataStore.detailsRuleForm.kd_subwarehouse = "";
+        }
+    }
+);
+//监听金蝶仓库值改变(值改变关联关系需重置)
+watch(
+    () => dataStore.detailsRuleForm.kd_warehouse_number,
+    (newVal: any) => {
+        if (newVal) {
+            dataStore.detailsRuleForm.kd_subwarehouse = "";
+            getSetWarehouseSubwarehousesList();
+        } else {
+            dataStore.detailsRuleForm.kd_subwarehouse = "";
+        }
+    }
+);
+</script>
+
+<style scope lang="scss">
+.down-dialog-box {
+    .el-dialog__body {
+        padding: 0 16px 40px;
+    }
+}
+.el-dialog .el-dialog__header {
+    padding: 8px 0;
+    font-weight: bold;
+}
+</style>