diff --git a/.env.development b/.env.development index 8db04bcf0..897b5253f 100644 --- a/.env.development +++ b/.env.development @@ -37,10 +37,22 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 -VITE_TENANT='["长春1379","成都1397","长春2379"]' +VITE_TENANT='["德立天津工厂"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' # 是否需要验证码 VITE_NEED_CODE = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"德立天津工厂","value":1}]' diff --git a/.env.dl-check b/.env.dl-check new file mode 100644 index 000000000..82ea805aa --- /dev/null +++ b/.env.dl-check @@ -0,0 +1,62 @@ +# 生产环境 +NODE_ENV=test + +VITE_DEV=false + +# 请求路径 +VITE_BASE_URL='http://172.16.0.13/api' + +# 上传路径 +VITE_UPLOAD_URL='http://172.16.0.13/api/admin-api/infra/file/upload' + +# 接口前缀 +VITE_API_BASEPATH= + +# 接口地址 +VITE_API_URL=/admin-api + +# 是否删除debugger +VITE_DROP_DEBUGGER=true + +# 是否删除console.log +VITE_DROP_CONSOLE=true + +# 是否sourcemap +VITE_SOURCEMAP=false + +# 打包路径 +VITE_BASE_PATH=/ + +# 输出路径 +VITE_OUT_DIR=sfms3.0 + +# 自定义接口路径 +VITE_INTERFACE_URL='http://172.16.0.13/magic/web/index.html' + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.16.0.13' + + +# 租户配置 +VITE_TENANT='["德立天津工厂"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://172.16.0.13' + +# 是否需要验证码 +VITE_NEED_CODE = false + +# 是否需要下载PDA链接 +VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.dl-prod b/.env.dl-prod new file mode 100644 index 000000000..82ea805aa --- /dev/null +++ b/.env.dl-prod @@ -0,0 +1,62 @@ +# 生产环境 +NODE_ENV=test + +VITE_DEV=false + +# 请求路径 +VITE_BASE_URL='http://172.16.0.13/api' + +# 上传路径 +VITE_UPLOAD_URL='http://172.16.0.13/api/admin-api/infra/file/upload' + +# 接口前缀 +VITE_API_BASEPATH= + +# 接口地址 +VITE_API_URL=/admin-api + +# 是否删除debugger +VITE_DROP_DEBUGGER=true + +# 是否删除console.log +VITE_DROP_CONSOLE=true + +# 是否sourcemap +VITE_SOURCEMAP=false + +# 打包路径 +VITE_BASE_PATH=/ + +# 输出路径 +VITE_OUT_DIR=sfms3.0 + +# 自定义接口路径 +VITE_INTERFACE_URL='http://172.16.0.13/magic/web/index.html' + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.16.0.13' + + +# 租户配置 +VITE_TENANT='["德立天津工厂"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://172.16.0.13' + +# 是否需要验证码 +VITE_NEED_CODE = false + +# 是否需要下载PDA链接 +VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.dl-test b/.env.dl-test new file mode 100644 index 000000000..82ea805aa --- /dev/null +++ b/.env.dl-test @@ -0,0 +1,62 @@ +# 生产环境 +NODE_ENV=test + +VITE_DEV=false + +# 请求路径 +VITE_BASE_URL='http://172.16.0.13/api' + +# 上传路径 +VITE_UPLOAD_URL='http://172.16.0.13/api/admin-api/infra/file/upload' + +# 接口前缀 +VITE_API_BASEPATH= + +# 接口地址 +VITE_API_URL=/admin-api + +# 是否删除debugger +VITE_DROP_DEBUGGER=true + +# 是否删除console.log +VITE_DROP_CONSOLE=true + +# 是否sourcemap +VITE_SOURCEMAP=false + +# 打包路径 +VITE_BASE_PATH=/ + +# 输出路径 +VITE_OUT_DIR=sfms3.0 + +# 自定义接口路径 +VITE_INTERFACE_URL='http://172.16.0.13/magic/web/index.html' + +# 积木报表请求路径 +VITE_JMREPORT_BASE_URL='http://172.16.0.13' + + +# 租户配置 +VITE_TENANT='["德立天津工厂"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://172.16.0.13' + +# 是否需要验证码 +VITE_NEED_CODE = false + +# 是否需要下载PDA链接 +VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.prod b/.env.prod index 06f2aa7cc..c400ac03a 100644 --- a/.env.prod +++ b/.env.prod @@ -52,3 +52,15 @@ VITE_NEED_CODE = true # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.test b/.env.test index cb687a764..676319e88 100644 --- a/.env.test +++ b/.env.test @@ -47,4 +47,16 @@ VITE_NEED_CODE = true # 是否需要下载PDA链接 -VITE_PDA_URL = true \ No newline at end of file +VITE_PDA_URL = true + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' \ No newline at end of file diff --git a/.env.test-scp b/.env.test-scp index 218728c32..9180ad97f 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -48,3 +48,15 @@ VITE_NEED_CODE = false # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.wyf b/.env.wyf index 7ee319b35..865f01438 100644 --- a/.env.wyf +++ b/.env.wyf @@ -46,11 +46,11 @@ VITE_DEV=false # # 上传路径 # VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload' -# 81 WMS请求路径 82 SCP -VITE_BASE_URL='http://172.22.32.9/api' -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload' +# 请求路径 +VITE_BASE_URL='http://dev.ccwin-in.com:25400/api' +# 上传路径 +VITE_UPLOAD_URL='http://dev.ccwin-in.com:25400/api/admin-api/infra/file/upload' # # 81 WMS请求路径 82 SCP @@ -116,7 +116,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' # 租户配置 -VITE_TENANT='["长春1379","成都1397","长春2379"]' +VITE_TENANT='["德立天津工厂"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://localhost' @@ -128,4 +128,16 @@ VITE_SYSTERM_UPDATE_ALERT = false VITE_NEED_CODE = false # 是否需要下载PDA链接 -VITE_PDA_URL = true \ No newline at end of file +VITE_PDA_URL = true + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"德立天津工厂","value":1}]' diff --git a/Dockerfile_prod b/Dockerfile_prod deleted file mode 100644 index e2a9419c2..000000000 --- a/Dockerfile_prod +++ /dev/null @@ -1,7 +0,0 @@ -# 设置基础镜像 -FROM win-nginx - -WORKDIR /opt/sfms3.0 -COPY nginx_prod.conf /usr/local/nginx/conf/nginx.conf -# 将dist文件中的内容复制到 /opt/sfms3.0 这个目录下面 -COPY sfms3.0/ /opt/sfms3.0 diff --git a/Dockerfile_scp b/Dockerfile_scp deleted file mode 100644 index 700cdf9a9..000000000 --- a/Dockerfile_scp +++ /dev/null @@ -1,7 +0,0 @@ -# 设置基础镜像 -FROM win-nginx - -WORKDIR /opt/sfms3.0 -COPY nginx_scp.conf /usr/local/nginx/conf/nginx.conf -# 将dist文件中的内容复制到 /opt/sfms3.0 这个目录下面 -COPY sfms3.0/ /opt/sfms3.0 diff --git a/index.html b/index.html index e1dc00eea..531256c97 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + @@ -132,7 +132,7 @@
- +
%VITE_APP_TITLE%
@@ -143,5 +143,20 @@
+ diff --git a/nginx_prod.conf b/nginx_prod.conf deleted file mode 100644 index 7cd6ed0f8..000000000 --- a/nginx_prod.conf +++ /dev/null @@ -1,101 +0,0 @@ -user root; -worker_processes 2; - -events { - worker_connections 1024; -} - -http { - include mime.types; - charset utf-8,gbk; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"'; - access_log logs/access.log main; - sendfile on; - #tcp_nopush on; - keepalive_timeout 600s; - client_max_body_size 200m; - gzip on; - gzip_min_length 10k; - gzip_comp_level 9; - gzip_buffers 4 16k; - gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png; - gzip_vary on; - gzip_disable "MSIE [1-6]\."; - upstream sfms3.0 { - server localhost:90 weight=10 max_fails=3 fail_timeout=10s; - } - server { - listen 80; - server_name_in_redirect off; - server_name _; - location /api/ { - proxy_pass http://sfms3.0/; - proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; - proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $http_x_forwarded_for; - } - location /profile/ { - alias /opt/profile/; - index index.html index.htm; - } - location / { - try_files $uri $uri/ /index.html; - root /opt/sfms3.0; - index index.html index.htm; - } - } - server { - listen 55563 ssl; - server_name_in_redirect off; - server_name _; - ssl_certificate /opt/faway-hella/faway-hella.com.pem; - ssl_certificate_key /opt/faway-hella/faway-hella.com.key; - location /api/ { - proxy_pass http://sfms3.0/; - proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; - proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $http_x_forwarded_for; - } - location /profile/ { - alias /opt/profile/; - index index.html index.htm; - } - location / { - try_files $uri $uri/ /index.html; - root /opt/sfms3.0; - index index.html index.htm; - } - } - server { - listen 56563 ssl; - server_name_in_redirect off; - server_name _; - ssl_certificate /opt/faway-hella/faway-hella.com.pem; - ssl_certificate_key /opt/faway-hella/faway-hella.com.key; - location /api/ { - proxy_pass http://sfms3.0/; - proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; - proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $http_x_forwarded_for; - } - location /profile/ { - alias /opt/profile/; - index index.html index.htm; - } - location / { - try_files $uri $uri/ /index.html; - root /opt/sfms3.0; - index index.html index.htm; - } - } -} - diff --git a/nginx_scp.conf b/nginx_scp.conf deleted file mode 100644 index 00a1a93ea..000000000 --- a/nginx_scp.conf +++ /dev/null @@ -1,53 +0,0 @@ -user root; -worker_processes 2; - -events { - worker_connections 1024; -} - -http { - include mime.types; - charset utf-8,gbk; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"'; - access_log logs/access.log main; - sendfile on; - #tcp_nopush on; - keepalive_timeout 600s; - client_max_body_size 200m; - gzip on; - gzip_min_length 10k; - gzip_comp_level 9; - gzip_buffers 4 16k; - gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png; - gzip_vary on; - gzip_disable "MSIE [1-6]\."; - upstream sfms3.0 { - server localhost:25311 weight=10 max_fails=3 fail_timeout=10s; - } - server { - listen 25400; - server_name_in_redirect off; - server_name _; - location /api/ { - proxy_pass http://sfms3.0/; - proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; - proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $http_x_forwarded_for; - } - location /profile/ { - alias /opt/profile/; - index index.html index.htm; - } - location / { - try_files $uri $uri/ /index.html; - root /opt/sfms3.0; - index index.html index.htm; - } - } -} - diff --git a/package.json b/package.json index be8467242..3456f9c80 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,9 @@ "test-scp": "vite build --mode test-scp", "prod": "vite build --mode prod", "preview": "vite preview", + "dl-prod": "vite build --mode dl-prod", + "dl-test": "vite build --mode dl-test", + "dl-check": "vite build --mode dl-check", "lint": "eslint --fix --ext .js,.vue src" }, "dependencies": { diff --git a/public/deli_logo_white.png b/public/deli_logo_white.png new file mode 100644 index 000000000..0f1118ace Binary files /dev/null and b/public/deli_logo_white.png differ diff --git a/public/deli_logo_white_blue.png b/public/deli_logo_white_blue.png new file mode 100644 index 000000000..bc4cbd02d Binary files /dev/null and b/public/deli_logo_white_blue.png differ diff --git a/public/logo1.png b/public/logo1.png new file mode 100644 index 000000000..0dcd2fa03 Binary files /dev/null and b/public/logo1.png differ diff --git a/public/logo_white.png b/public/logo_white.png new file mode 100644 index 000000000..fe3f26474 Binary files /dev/null and b/public/logo_white.png differ diff --git a/public/logo_white_blue.png b/public/logo_white_blue.png new file mode 100644 index 000000000..5f8214f15 Binary files /dev/null and b/public/logo_white_blue.png differ diff --git a/public/systemConfig.js b/public/systemConfig.js index 394209322..5e8ea815e 100644 --- a/public/systemConfig.js +++ b/public/systemConfig.js @@ -1,20 +1,32 @@ +const origin = window.location.origin//协议、域名和端口号 let systemConfig = { // 请求路径 - baseUrl: 'http://172.22.32.8/api', + baseUrl: `${origin}/api`, // 上传路径 - uploadUrl: 'http://172.22.32.8/api/admin-api/infra/file/upload', + uploadUrl: `${origin}/api/admin-api/infra/file/upload`, // 自定义接口路径 - interfaceUrl: 'http://172.22.32.8:90/magic/web/index.html', + interfaceUrl: `${origin}/magic/web/index.html`, // 积木报表请求路径 - jmreportBaseUrl: 'http://172.22.32.8:90', + jmreportBaseUrl: `${origin}`, // 查看质检报告环境 - reportUrl: 'https://scp.faway-hella.com', + reportUrl: `${origin}`, // 租户配置 tenant: '["成都"]', systermUpdateAlert: true, - systermUpdateUrl: 'https://scptest.faway-hella.com/', + systermUpdateUrl: `${origin}/`, //是否需要验证码 needCode:false, //是否需要PDA下载链接 - pdaUrl:false, + pdaUrl: false, + + // logo图标 + logoUrl: '/logo_white_blue.png', + // logo图标 + logoUrlWhite: '/logo_white.png', + // 项目名称 + projectName: '富维海拉智慧工厂管理平台', + // 浏览器上方图标 + iconUrl: '/logo1.png', + // 租戶列表 + tenantList:'[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' } diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 8854a8b3d..03d44165a 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -101,6 +101,11 @@ export const batchPrintingLable = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLable`, data }) } +// 批量打印标签（德立） +export const batchPrintingLablesForDL = async (data: any) => { + return await request.post({ url: `/wms/package/batchPrintingLablesForDL`, data }) +} + // 批量打印标签多选 export const batchPrintingLables = async (data: any) => { diff --git a/src/assets/imgs/login-bg.png b/src/assets/imgs/login-bg.png index a0e6f1c61..13ae47e26 100644 Binary files a/src/assets/imgs/login-bg.png and b/src/assets/imgs/login-bg.png differ diff --git a/src/hooks/web/useTitle.ts b/src/hooks/web/useTitle.ts index e531855ec..70fe0f14d 100644 --- a/src/hooks/web/useTitle.ts +++ b/src/hooks/web/useTitle.ts @@ -1,6 +1,7 @@ import { watch, ref } from 'vue' import { isString } from '@/utils/is' import { useAppStoreWithOut } from '@/store/modules/app' +import { getProjectName } from '@/utils/systemParam' const { t } = useI18n() // 国际化 const appStore = useAppStoreWithOut() @@ -15,7 +16,7 @@ export const useTitle = (newTitle?: string) => { title, (n, o) => { if (isString(n) && n !== o && document) { - document.title = n.replace(import.meta.env.VITE_APP_TITLE,t(`ts.${import.meta.env.VITE_APP_TITLE}`)) + document.title = n.replace(import.meta.env.VITE_APP_TITLE, t(`ts.${getProjectName()}`)) } }, { immediate: true } diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue index 57e672915..23c0be7be 100644 --- a/src/layout/components/Logo/src/Logo.vue +++ b/src/layout/components/Logo/src/Logo.vue @@ -2,6 +2,7 @@ import { computed, onMounted, ref, unref, watch } from 'vue' import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' +import { getWhiteLogo,getProjectName } from '@/utils/systemParam' defineOptions({ name: 'Logo' }) @@ -13,7 +14,7 @@ const appStore = useAppStore() const show = ref(true) -const title = computed(() => appStore.getTitle) +const title = computed(() =>getProjectName()) const layout = computed(() => appStore.getLayout) @@ -77,9 +78,9 @@ watch( ]" to="/" > -
- - {{ t(`ts.${underlineToHump(appStore.getTitle)}`) }} + + {{ t(`ts.${underlineToHump(getProjectName())}`) }}
@@ -33,8 +33,8 @@ class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end" >
- - {{ t(`ts.${underlineToHump(appStore.getTitle)}`) }} + + {{ t(`ts.${underlineToHump(getProjectName())}`) }}
@@ -72,6 +72,7 @@ import { useDesign } from '@/hooks/web/useDesign' import { useAppStore } from '@/store/modules/app' import { ThemeSwitch } from '@/layout/components/ThemeSwitch' import { LocaleDropdown } from '@/layout/components/LocaleDropdown' +import {getLogo,getProjectName } from '@/utils/systemParam' import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue,QRCodePDA } from './components' diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 92749ca25..4b8299ec1 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -181,7 +181,7 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '回收件', + label: '可标准', field: 'isRecycled', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 78e70f6aa..a6b0182b8 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -229,8 +229,8 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增 - // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入 + defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增 + defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入 defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main:export' }), // 导出 // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布 defaultButtons.defaultFreshBtn(null), // 刷新 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index ea0965edc..5b29d39fc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -124,7 +124,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ searchPage: PurchaseMainApi.getPurchaseMainPage, searchCondition: [{ key: 'type', - value: 'SCHEDULE,OUTSOURCING', + value: 'SCHEDULE,OUTSOURCING,DISCRETE', isMainValue: false },{ key: 'available', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index bb824ef87..2085d1158 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -55,7 +55,8 @@