From 1f89fdaf74ec0d6b503173ed380ad1cede60d48b Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Sat, 22 Jun 2024 11:23:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=90=8E=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 +- .env.hella13 | 43 ----------------- .env.hella14 | 43 ----------------- .env.hella16 | 40 ---------------- .env.hella8 | 44 ------------------ .env.hella9 | 43 ----------------- .env.hella15 => .env.prod | 13 ++++-- .env.test | 2 +- .env.test-scp | 3 ++ .env.wyf | 5 +- index.html | 1 + package.json | 7 +-- public/systemConfig.js | 12 +++++ src/components/Annex/src/Annex.vue | 3 +- src/components/Annex/src/AnnexLedger.vue | 3 +- src/components/Editor/src/Editor.vue | 3 +- .../ImportForm/src/ImportDetailForm.vue | 11 +++-- src/components/ImportForm/src/ImportForm.vue | 11 +++-- src/components/UploadFile/src/UploadFile.vue | 5 +- src/components/UploadFile/src/UploadImg.vue | 4 +- src/components/UploadFile/src/UploadImgs.vue | 4 +- src/config/axios/config.ts | 4 +- src/utils/systemParam.ts | 46 +++++++++++++++++++ src/views/bpm/model/ModelImportForm.vue | 3 +- src/views/eam/item/index.vue | 4 +- src/views/eam/location/index.vue | 4 +- src/views/infra/customInterface/index.vue | 3 +- src/views/infra/druid/index.vue | 3 +- src/views/infra/file/FileForm.vue | 4 +- src/views/infra/server/index.vue | 3 +- src/views/infra/swagger/index.vue | 5 +- src/views/infra/webSocket/index.vue | 4 +- src/views/report/jmreport/index.vue | 6 +-- src/views/system/user/UserImportForm.vue | 4 +- .../labelManage/callmaterials/index.vue | 3 +- .../labelManage/locationLabel/index.vue | 3 +- .../labelManage/manufacturePackage/index.vue | 5 +- .../labelManage/purchasePackage/index.vue | 3 +- .../customerreturnRecordMain/index.vue | 3 +- .../customerreturnRequestMain/index.vue | 3 +- .../deliver/deliverRecordMain/index.vue | 3 +- .../wms/inventoryManage/balance/index.vue | 3 +- .../wms/inventoryManage/package/index.vue | 3 +- .../inventoryinitRecordMain/index.vue | 3 +- .../packageoverRecordMain/index.vue | 5 +- .../packageoverRetrospect/index.vue | 3 +- .../unplannedreceiptRequestMain/index.vue | 3 +- .../productionreturnRequestMain/index.vue | 3 +- .../productionreturnRequestMainNo/index.vue | 3 +- .../productreceiptRecordMain/index.vue | 3 +- .../productreceiptRequestMain/index.vue | 3 +- .../index.vue | 3 +- .../index.vue | 3 +- .../productreceiptscrapRequestMain/index.vue | 3 +- .../productredressRequestMain/index.vue | 3 +- .../purchasereceiptJobMain/index.vue | 3 +- .../purchasereceiptRecordMain/index.vue | 3 +- .../purchasereceiptRequestMain/index.vue | 6 ++- .../purchasereturnRecordMain/index.vue | 3 +- .../purchasereturnRequestMain/index.vue | 3 +- .../putaway/putawayJobMain/index.vue | 3 +- .../sparereceiptRequestMain/index.vue | 3 +- .../supplierdeliver/supplierPackage/index.vue | 3 +- .../supplierdeliverRecordMain/index.vue | 3 +- .../supplierdeliverRequestMain/index.vue | 3 +- src/views/wms/reportList/index.vue | 3 +- .../purchaseclaimRequestMain/index.vue | 3 +- .../supplierinvoiceRequestMain/index.vue | 3 +- 68 files changed, 204 insertions(+), 303 deletions(-) delete mode 100644 .env.hella13 delete mode 100644 .env.hella14 delete mode 100644 .env.hella16 delete mode 100644 .env.hella8 delete mode 100644 .env.hella9 rename .env.hella15 => .env.prod (56%) create mode 100644 public/systemConfig.js create mode 100644 src/utils/systemParam.ts diff --git a/.env.development b/.env.development index 7ffad86e9..0baf5cba7 100644 --- a/.env.development +++ b/.env.development @@ -37,4 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 -VITE_TENANT='["长春","成都"]' \ No newline at end of file +VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.hella13 b/.env.hella13 deleted file mode 100644 index 21d8a4bb0..000000000 --- a/.env.hella13 +++ /dev/null @@ -1,43 +0,0 @@ -# wms海拉长春生产环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.21.32.13/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.21.32.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-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.21.32.13:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' - -# 租户配置 -VITE_TENANT='["长春"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scp.faway-hella.com' \ No newline at end of file diff --git a/.env.hella14 b/.env.hella14 deleted file mode 100644 index 9b5fca566..000000000 --- a/.env.hella14 +++ /dev/null @@ -1,43 +0,0 @@ -# wms海拉长春测试环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.21.32.14/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.21.32.14/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-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.21.32.14:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' - -# 租户配置 -VITE_TENANT='["长春"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scptest.faway-hella.com' \ No newline at end of file diff --git a/.env.hella16 b/.env.hella16 deleted file mode 100644 index e5f3cf2a6..000000000 --- a/.env.hella16 +++ /dev/null @@ -1,40 +0,0 @@ -# scp海拉长春测试环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='https://scptest.faway-hella.com/api' - -# 上传路径 -VITE_UPLOAD_URL='https://scptest.faway-hella.com/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-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='https://scptest.faway-hella.com/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com' - -# 租户配置 -VITE_TENANT='["长春","成都"]' diff --git a/.env.hella8 b/.env.hella8 deleted file mode 100644 index d022f0740..000000000 --- a/.env.hella8 +++ /dev/null @@ -1,44 +0,0 @@ -# wms海拉成都生产环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.22.32.8/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.8/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-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.22.32.8:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' - - -# 租户配置 -VITE_TENANT='["成都"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scp.faway-hella.com' \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 deleted file mode 100644 index baf753b61..000000000 --- a/.env.hella9 +++ /dev/null @@ -1,43 +0,0 @@ -# wms海拉成都测试环境 -NODE_ENV=production - -VITE_DEV=false - -# 请求路径 -VITE_BASE_URL='http://172.22.32.9/api' - -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.9/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-ui - -# 自定义接口路径 -VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' - -# 租户配置 -VITE_TENANT='["成都"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'https://scptest.faway-hella.com' diff --git a/.env.hella15 b/.env.prod similarity index 56% rename from .env.hella15 rename to .env.prod index 122b9022e..dabaa224f 100644 --- a/.env.hella15 +++ b/.env.prod @@ -1,13 +1,13 @@ -# scp海拉长春生产环境 +# 生产环境 NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='https://scp.faway-hella.com/api' +VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' # 上传路径 -VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -31,10 +31,13 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 -VITE_INTERFACE_URL='https://scp.faway-hella.com/magic/web/index.html' +VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com' +VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' # 租户配置 VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test b/.env.test index 53100a20f..02d51a0d7 100644 --- a/.env.test +++ b/.env.test @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' diff --git a/.env.test-scp b/.env.test-scp index e64386900..c97b58331 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -39,3 +39,6 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311' # 租户配置 VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.wyf b/.env.wyf index 5b2520335..03883d055 100644 --- a/.env.wyf +++ b/.env.wyf @@ -48,4 +48,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' # 租户配置 -VITE_TENANT='["长春","成都"]' \ No newline at end of file +VITE_TENANT='["长春","成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/index.html b/index.html index e322068ed..e164a59b3 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,7 @@ + %VITE_APP_TITLE% diff --git a/package.json b/package.json index be89b1319..5646cfe76 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,7 @@ "wyf": "vite --mode wyf", "test": "vite build --mode test", "test-scp": "vite build --mode test-scp", - "hella8": "vite build --mode hella8", - "hella9": "vite build --mode hella9", - "hella13": "vite build --mode hella13", - "hella14": "vite build --mode hella14", - "hella15": "vite build --mode hella15", - "hella16": "vite build --mode hella16", + "prod": "vite build --mode prod", "preview": "vite preview", "lint": "eslint --fix --ext .js,.vue src" }, diff --git a/public/systemConfig.js b/public/systemConfig.js new file mode 100644 index 000000000..e01e65ffc --- /dev/null +++ b/public/systemConfig.js @@ -0,0 +1,12 @@ +let systemConfig = { + // 请求路径 + baseUrl: 'http://172.22.32.8/api', + // 上传路径 + uploadUrl: 'http://172.22.32.8/api/admin-api/infra/file/upload', + // 自定义接口路径 + interfaceUrl: 'http://172.22.32.8:90/magic/web/index.html', + // 积木报表请求路径 + jmreportBaseUrl: 'http://172.22.32.8:90', + // 查看质检报告环境 + reportUrl: 'https://scp.faway-hella.com' +} diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index 1a1b128a6..2c7f75bfe 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -33,6 +33,7 @@ import PreviewPDF from '@/components/PreviewPDF/index.vue' import UploadFile from '@/components/UploadFile/src/UploadFile.vue' import { formatDate } from '@/utils/formatTime' import * as FileApi from '@/api/wms/file' +import { getBaseUrl } from '@/utils/systemParam' const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 defineComponent({ @@ -91,7 +92,7 @@ const deleteAnnex = async (id) => { emit('deleteAnnexSuccess') } const downFile = (item)=>{ - window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path) + window.open(getBaseUrl() + '/admin-api/infra/file/0/get/' + item.path) } const previewRef = ref>() diff --git a/src/components/Annex/src/AnnexLedger.vue b/src/components/Annex/src/AnnexLedger.vue index 94435ce56..c364747fd 100644 --- a/src/components/Annex/src/AnnexLedger.vue +++ b/src/components/Annex/src/AnnexLedger.vue @@ -34,6 +34,7 @@ import PreviewPDF from '@/components/PreviewPDF/index.vue' import UploadFile from '@/components/UploadFile/src/UploadFile.vue' import { formatDate } from '@/utils/formatTime' import * as FileApi from '@/api/wms/file' +import { getBaseUrl } from '@/utils/systemParam' const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 defineComponent({ @@ -94,7 +95,7 @@ const deleteAnnex = async (id) => { emit('deleteAnnexSuccess',id) } const downFile = (item)=>{ - window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path) + window.open(getBaseUrl() + '/admin-api/infra/file/0/get/' + item.path) } const previewRef = ref>() diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue index ec40bca27..6a9843509 100644 --- a/src/components/Editor/src/Editor.vue +++ b/src/components/Editor/src/Editor.vue @@ -7,6 +7,7 @@ import { isNumber } from '@/utils/is' import { ElMessage } from 'element-plus' import { useLocaleStore } from '@/store/modules/locale' import { getAccessToken, getTenantId } from '@/utils/auth' +import { getUploadUrl } from '@/utils/systemParam' defineOptions({ name: 'Editor' }) @@ -88,7 +89,7 @@ const editorConfig = computed((): IEditorConfig => { scroll: true, MENU_CONF: { ['uploadImage']: { - server: import.meta.env.VITE_UPLOAD_URL, + server: getUploadUrl(), // 单个文件的最大体积限制，默认为 2M maxFileSize: 5 * 1024 * 1024, // 最多可上传几个文件，默认为 100 diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue index bda6ffdfe..2fac1ad26 100644 --- a/src/components/ImportForm/src/ImportDetailForm.vue +++ b/src/components/ImportForm/src/ImportDetailForm.vue @@ -104,6 +104,7 @@ diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue index b391087a9..9e3e12f88 100644 --- a/src/views/system/user/UserImportForm.vue +++ b/src/views/system/user/UserImportForm.vue @@ -44,6 +44,7 @@ import * as UserApi from '@/api/system/user' import { getAccessToken, getTenantId } from '@/utils/auth' import download from '@/utils/download' +import { getBaseUrl } from '@/utils/systemParam' defineOptions({ name: 'SystemUserImportForm' }) @@ -52,8 +53,7 @@ const message = useMessage() // 消息弹窗 const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中 const uploadRef = ref() -const importUrl = - import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import' +const importUrl = getBaseUrl() + import.meta.env.VITE_API_URL + '/system/user/import' const uploadHeaders = ref() // 上传 Header 头 const fileList = ref([]) // 文件列表 const updateSupport = ref(0) // 是否更新已经存在的用户数据 diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 961ddc139..2d39e52da 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -78,6 +78,7 @@ import { getAccessToken } from '@/utils/auth' import * as PackageApi from '@/api/wms/package' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 叫料标签 defineOptions({ name: 'Callmaterials' }) @@ -267,7 +268,7 @@ const handleExport = async () => { } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken()) const srcPoint = ref(BASE_URL + '/jmreport/view/940818992169918464?token=' + getAccessToken()) // 标签打印 diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index 8f68f72a9..c4a6ca187 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -53,6 +53,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import * as Itempackaging from '@/api/wms/itempackaging' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 库位标签 defineOptions({ name: 'LocationLabel' }) @@ -183,7 +184,7 @@ const handleExport = async () => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken()) // 标签打印 const handlePoint = async (row) => { diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index d8f866fa4..f055699ca 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import * as Itempackaging from '@/api/wms/itempackage' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 采购标签 defineOptions({ name: 'PurchasePackage' }) @@ -252,7 +253,7 @@ const handleExport = async () => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) // 标签打印 // const handlePoint = async (row) => { @@ -330,4 +331,4 @@ onMounted(async () => { getList() }) -@/api/wms/itempackage \ No newline at end of file +@/api/wms/itempackage diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 8f648bd53..683dacecf 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -67,6 +67,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import * as Itempackaging from '@/api/wms/itempackage' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 采购标签 defineOptions({ name: 'PurchasePackage' }) @@ -253,7 +254,7 @@ const handleExport = async () => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { console.log(row.packingNumber,445555555555555); diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue index 5ff523ad5..cd714d6bf 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue @@ -69,6 +69,7 @@ import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 客户退货记录主 defineOptions({ name: 'CustomerreturnRecordMain' }) @@ -177,7 +178,7 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/929216638195793920?token=' + getAccessToken()) // 标签打印 const handlePoint = async (row) => { diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 599867dd7..079e21399 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -115,6 +115,7 @@ import { } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 客户退货申请 defineOptions({ name: 'CustomerreturnRequestMain' }) @@ -451,7 +452,7 @@ const submitFormLabel = async (formType, data) => { formLabelRef.value.dialogVisible = false } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const showLabelRef = ref() diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index 4f7b9dda3..c38bee76b 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -69,6 +69,7 @@ import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 发货记录主 defineOptions({ name: 'DeliverRecordMain' }) @@ -190,7 +191,7 @@ const handleExport = async () => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken()) // 标签打印 const handlePoint = async (row) => { diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 8e5432f6e..8a372224e 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -69,6 +69,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 库存余额 defineOptions({ name: 'Balance' }) @@ -244,7 +245,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance') } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const handlePoint = async (row) => { diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 896a97932..8601b4fc8 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -64,6 +64,7 @@ import { getAccessToken } from '@/utils/auth' import { Package,PackageRules } from './package.data' import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { getJmreportBaseUrl } from '@/utils/systemParam' defineOptions({ name: 'package' }) @@ -238,7 +239,7 @@ const handleExport = async () => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // form表单提交 const formsSuccess = async (formType,data) => { diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index e00ac3d7d..7fd3c08e0 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -71,6 +71,7 @@ import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDeta import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 库存初始化记录主 defineOptions({ name: 'InventoryinitRecordMain' }) @@ -196,7 +197,7 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => { }) } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const handleSelectionPoint = async ()=>{ let rows:any = [] selectionRows.value.forEach(item=>{ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index 8af93c106..6ec1b7dbd 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -70,6 +70,7 @@ import * as printLabelCorrelationApi from '@/api/wms/printLabelCorrelation' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 翻包记录 defineOptions({ name: 'PackageoverMain' }) @@ -136,7 +137,7 @@ const buttonTableClick = async (val, row) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const handlePoint = async (row) => { @@ -203,4 +204,4 @@ const searchFormClick = (searchData) => { onMounted(async () => { getList() }) - \ No newline at end of file + diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index cfe7db9a5..80f672fb3 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -50,6 +50,7 @@ import { PackageoverRetrospect } from './packageoverRetrospect.data' import * as PackageoverRetrospectApi from '@/api/wms/packageoverRetrospect' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' +import { getJmreportBaseUrl } from '@/utils/systemParam' defineOptions({ name: 'PackageoverRetrospect' }) @@ -89,7 +90,7 @@ const buttonTableClick = async (val, row) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const handlePoint = async (row) => { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index ecea47756..a7e6d3719 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -131,6 +131,7 @@ import * as PackageApi from "@/api/wms/package"; import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import * as StdcostpriceApi from '@/api/wms/stdcostprice' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 计划外入库申请 defineOptions({ name: 'UnplannedreceiptRequestMain' }) @@ -794,7 +795,7 @@ const tableFormSelectOnBlur = (field, val, row, index) => { } // 标签打印 -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/936912164754612224?token=' + getAccessToken()) const labelPrint = async (row) => { window.open(src.value + '&request_number=' + row.number) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 541ff60c3..de88ffd93 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -107,6 +107,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 生产退料申请 defineOptions({ name: 'ProductionreturnRequestMain' }) @@ -685,7 +686,7 @@ const submitFormLabel = async (formType, data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 标签打印 const handlePoint = async (row) => { // 查询是否已创建过标签 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index fb71164a9..ca633a136 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -107,6 +107,7 @@ import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 隔离退料申请 defineOptions({ name: 'ProductionreturnRequestMainNo' }) @@ -609,7 +610,7 @@ const submitFormLabel = async (formType, data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 标签打印 // const handlePoint = async (row) => { // // 查询是否已创建过标签 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 339d7bde1..cad97ad6d 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -100,6 +100,7 @@ import { } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 制品收货记录主 // 预生产收货记录主 @@ -207,7 +208,7 @@ const buttonTableClick = async (val, row) => { labelPrint(row) } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 标签打印 const searchTableRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 93d80734e..912b99090 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -146,6 +146,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import dayjs from 'dayjs' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 制品收货申请 // 预生产收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) @@ -663,7 +664,7 @@ const detailValidate = (data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 标签打印 const handlePoint = async (row) => { // 查询是否已创建过标签 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index b2d7a55b0..ea1a36e30 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -121,6 +121,7 @@ import { getAccessToken } from '@/utils/auth' import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 装配收货记录主 defineOptions({ name: 'ProductreceiptRecordMainA' }) @@ -274,7 +275,7 @@ const labelPrint = async (row) => { searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 批量打印--装配收货申请 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { console.log('批量打印',val) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 50110ead5..8bb2c8f3f 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -146,6 +146,7 @@ import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 装配收货申请 defineOptions({ name: 'ProductreceiptRequestMainA' }) @@ -665,7 +666,7 @@ const detailValidate = (data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 标签打印 const handlePoint = async (row) => { // 查询是否已创建过标签 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 8494ac698..8c7af6533 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -137,6 +137,7 @@ import { getAccessToken } from '@/utils/auth' import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 制品收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) @@ -656,7 +657,7 @@ const detailValidate = (data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() // 标签打印 const handlePoint = async (row) => { diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index a6fe9dc21..5f27152b2 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -112,6 +112,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { getJmreportBaseUrl } from '@/utils/systemParam' defineOptions({ name: 'ProductredressRequestMain' }) @@ -481,7 +482,7 @@ const detailValidate = (data) => { } } -// const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +// const BASE_URL = getJmreportBaseUrl() // // 标签打印 // const handlePoint = async (row) => { // // 查询是否已创建过标签 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index a0b3851d6..58a8a2000 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -103,6 +103,7 @@ import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain' import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { getReportUrl } from '@/utils/systemParam' // 采购收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -257,7 +258,7 @@ const showQualityReport = ref(false) const qualityReport = ref('') const checkQualityReport = async (row)=>{ showQualityReport.value = true - qualityReport.value = `${import.meta.env.VITE_REPORT_URL}/purchasereceiptReport?asnNumber=${row.asnNumber}` + qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}` } /** 关闭按钮操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 3f9a0a5ef..869231e59 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -114,6 +114,7 @@ import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecord import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { getReportUrl } from '@/utils/systemParam' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) const message = useMessage() // 消息弹窗 @@ -192,7 +193,7 @@ const showQualityReport = ref(false) const qualityReport = ref('') const checkQualityReport = async (row)=>{ showQualityReport.value = true - qualityReport.value = `${import.meta.env.VITE_REPORT_URL}/purchasereceiptReport?asnNumber=${row.asnNumber}` + qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}` } /** 生成采购上架申请按钮操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 6d43e8b9c..7a6faa483 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -166,6 +166,8 @@ import * as SupplieritemApi from '@/api/wms/supplieritem' import { getAccessToken } from '@/utils/auth' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import * as ItembasicApi from '@/api/wms/itembasic' +import { getJmreportBaseUrl } from '@/utils/systemParam' +import { getReportUrl } from '@/utils/systemParam' // 采购收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' }) @@ -406,7 +408,7 @@ const showQualityReport = ref(false) const qualityReport = ref('') const checkQualityReport = async (row)=>{ showQualityReport.value = true - qualityReport.value = `${import.meta.env.VITE_REPORT_URL}/purchasereceiptReport?asnNumber=${row.asnNumber}` + qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}` } // 生成标签 @@ -434,7 +436,7 @@ const submitFormLabel = async (formType, data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 9b7432600..4619a99d0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -69,6 +69,7 @@ import * as PurchasereturnRecordDetailApi from '@/api/wms/purchasereturnRecordDe import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 采购退货记录主 defineOptions({ name: 'PurchasereturnRecordMain' }) @@ -144,7 +145,7 @@ const buttonTableClick = async (val, row) => { } // 单据打印 -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (id) => { window.open(documentSrc.value + '&id=' + id) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 8b785e5fc..d654f69dc 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -136,6 +136,7 @@ import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' import * as BalanceApi from '@/api/wms/balance' import { async } from '@antv/x6/lib/registry/marker/async' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestMain' }) @@ -937,7 +938,7 @@ const detailOpenForm = (type, row) =>{ } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index cfaf6ee4f..c41b566a0 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -100,6 +100,7 @@ import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import {getAccessToken} from "@/utils/auth"; +import { getJmreportBaseUrl } from '@/utils/systemParam' // 上架任务主 defineOptions({ name: 'PutawayJobMain' }) @@ -283,7 +284,7 @@ const buttonTableClick = async (val, row) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/956092950844162048?token=' + getAccessToken()) const handleDocumentPrint = async (row) => { window.open(src.value+'&id='+row.masterId) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 096077b6b..908c243e8 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -133,6 +133,7 @@ import { getAccessToken } from '@/utils/auth' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data' import * as ItembasicApi from '@/api/wms/itembasic' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 备件收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' }) @@ -428,7 +429,7 @@ const submitFormLabel = async (formType, data) => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue index c4ebc516e..d5aaf02c0 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue @@ -64,6 +64,7 @@ import { getAccessToken } from '@/utils/auth' import { Package,PackageRules } from './supplierPackage.data' import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { getJmreportBaseUrl } from '@/utils/systemParam' defineOptions({ name: 'PurchasePackage' }) @@ -237,7 +238,7 @@ const handleExport = async () => { } } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) // 标签打印 const handlePoint = async (id) => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 67924eca3..0925bd6ff 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -114,6 +114,7 @@ import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverReque import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 供应商发货记录主 defineOptions({ name: 'SupplierdeliverRecordMain' }) @@ -207,7 +208,7 @@ const handlerCreatePurchasereceiptRequest = async (number:string) => { } // 单据打印 -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() //const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken()) const documentSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken()) const handleDocumentPrint = async (id) => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index c87a8cf35..8aacc9693 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -185,6 +185,7 @@ import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 供应商发货申请 defineOptions({ name: 'SupplierdeliverRequestMain' }) @@ -868,7 +869,7 @@ const clearInput = async (field,row,index) => { } -const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL +const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口 diff --git a/src/views/wms/reportList/index.vue b/src/views/wms/reportList/index.vue index 8c8385a59..4974c88fe 100644 --- a/src/views/wms/reportList/index.vue +++ b/src/views/wms/reportList/index.vue @@ -7,10 +7,11 @@ diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index 5057b380c..8c4a12edb 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -76,6 +76,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import TableHead from '@/components/TableHead/src/TableHead.vue' +import { getJmreportBaseUrl } from '@/utils/systemParam' // 供应商索赔申请 defineOptions({ name: 'PurchaseclaimRequestMain' }) @@ -420,7 +421,7 @@ } } - const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL + const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/882550592342003712?token=' + getAccessToken()) console.log(src) // 打印 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index d1c733701..663819072 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -186,6 +186,7 @@ import { Supplier } from '../../../basicDataManage/supplierManage/supplier/supplier.data' import { getAccessToken } from '@/utils/auth' import { ElMessageBox } from 'element-plus' +import { getJmreportBaseUrl } from '@/utils/systemParam' defineOptions({ name: 'SupplierinvoiceRequestMain' }) @@ -959,7 +960,7 @@ const importSuccess = () => { } } - const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL + const BASE_URL = getJmreportBaseUrl() //供应商发货单打印 const documentSupplierdeliverRecordSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken())