From c357ba865fa12f7ac4732dad9457fcf0795ae102 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 26 Dec 2025 10:47:33 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-26=20pda=E7=9A=84=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=92=8C=E6=8B=86=E5=90=88=E7=BB=84=E6=89=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A6=82=E6=9E=9C=E6=9C=AA=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=93=E5=8D=B0=E6=9C=BA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=B0=B1=E8=B7=B3=E8=BF=87=E4=B8=8D=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/utils/LodopFuncs.js | 36 ++++++++++--------- .../label-split-merge/labelSplitMerge.vue | 4 ++- .../other-inout/otherInboundDetail.vue | 4 ++- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 32b3d35..3e79fed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gaotao-fast-vue", - "version": "1.2.3", + "version": "1.2.4", "description": "gaotao-fast-vue基于vue、element-ui构建开发，实现gaotao-fast后台管理前端功能，提供一套更优的前端解决方案。", "author": "daxiong.yang ", "private": true, diff --git a/src/utils/LodopFuncs.js b/src/utils/LodopFuncs.js index 73732b0..1c525de 100644 --- a/src/utils/LodopFuncs.js +++ b/src/utils/LodopFuncs.js @@ -3,8 +3,10 @@ import { MessageBox } from 'element-ui' //用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占: var MainJS = "CLodopfuncs.js", - URL_WS1 = "ws://192.168.1.147:8000/" + MainJS, //ws用8000/18000 - URL_WS2 = "ws://192.168.1.147:18000/" + MainJS, + URL_WS1 = "ws://10.1.15.53:8000/" + MainJS, //ws用8000/18000 + URL_WS2 = "ws://10.1.15.53:18000/" + MainJS, + // URL_WS1= "ws://192.168.1.147:8000/" + MainJS, //ws用8000/18000 + // URL_WS2= "ws://192.168.1.147:18000/" + MainJS, URL_HTTP1 = "http://localhost:8000/" + MainJS, //http用8000/18000 URL_HTTP2 = "http://localhost:18000/" + MainJS, URL_HTTP3 = "https://localhost.lodop.net:8443/" + MainJS; //https用8000/8443 @@ -116,11 +118,11 @@ function getLodop(oOBJECT, oEMBED) { if (!LODOP) { logger.info("LodopFuncs.js getLodop no CLodop"); MessageBox({ - title: 'Information', + title: '打印组件', type: 'warning', showCancelButton: true, - confirmButtonText: 'Download', - cancelButtonText: 'Cancel', + confirmButtonText: '下载', + cancelButtonText: '取消', zIndex: 3000, message: "您没有安装打印组件或者您安装的版本不是最新版本，请下载并安装或升级，同时请检查相关服务是否已启动，最后请关闭并重新打开浏览器。", callback: res => { @@ -141,11 +143,11 @@ function getLodop(oOBJECT, oEMBED) { if (needUpgrade) { MessageBox({ - title: 'Information', + title: '打印组件', type: 'warning', showCancelButton: true, - confirmButtonText: 'Download', - cancelButtonText: 'Cancel', + confirmButtonText: '下载', + cancelButtonText: '取消', zIndex: 3000, message: "您没有安装打印组件或者您安装的版本不是最新版本，请下载并安装或升级，同时请检查相关服务是否已启动，最后请关闭并重新打开浏览器。", callback: res => { @@ -188,11 +190,11 @@ function getLodop(oOBJECT, oEMBED) { //==Lodop插件未安装时提示下载:== if ((!LODOP) || (!LODOP.VERSION)) { MessageBox({ - title: 'Information', + title: '打印组件', type: 'warning', showCancelButton: true, - confirmButtonText: 'Download', - cancelButtonText: 'Cancel', + confirmButtonText: '下载', + cancelButtonText: '取消', zIndex: 3000, message: "您没有安装打印组件或者您安装的版本不是最新版本，请下载并安装或升级，同时请检查相关服务是否已启动，最后请关闭并重新打开浏览器。", callback: res => { @@ -206,11 +208,11 @@ function getLodop(oOBJECT, oEMBED) { if (LODOP.VERSION < "6.2.2.6") { MessageBox({ - title: 'Information', + title: '打印组件', type: 'warning', showCancelButton: true, - confirmButtonText: 'Download', - cancelButtonText: 'Cancel', + confirmButtonText: '下载', + cancelButtonText: '取消', zIndex: 3000, message: "您没有安装打印组件或者您安装的版本不是最新版本，请下载并安装或升级，同时请检查相关服务是否已启动，最后请关闭并重新打开浏览器。", callback: res => { @@ -231,11 +233,11 @@ function getLodop(oOBJECT, oEMBED) { return LODOP; } catch (err) { MessageBox({ - title: 'Information', + title: '打印组件', type: 'warning', showCancelButton: true, - confirmButtonText: 'Download', - cancelButtonText: 'Cancel', + confirmButtonText: '下载', + cancelButtonText: '取消', zIndex: 3000, message: "您没有安装打印组件或者您安装的版本不是最新版本，请下载并安装或升级，同时请检查相关服务是否已启动，最后请关闭并重新打开浏览器。", callback: res => { diff --git a/src/views/modules/label-split-merge/labelSplitMerge.vue b/src/views/modules/label-split-merge/labelSplitMerge.vue index e9f6e0d..658fdc6 100644 --- a/src/views/modules/label-split-merge/labelSplitMerge.vue +++ b/src/views/modules/label-split-merge/labelSplitMerge.vue @@ -412,7 +412,9 @@ export default { printerName = printerConfig.printerName; console.log('使用用户配置的打印机:', printerName); } else { - console.log('未找到用户打印机配置，使用默认打印机'); + console.warn('未找到用户打印机配置，跳过打印'); + this.$message.warning('未配置用户打印机，请在系统中配置默认打印机后再打印'); + return; } // 4. 执行打印 diff --git a/src/views/modules/other-inout/otherInboundDetail.vue b/src/views/modules/other-inout/otherInboundDetail.vue index 00c6c9b..a8d88a7 100644 --- a/src/views/modules/other-inout/otherInboundDetail.vue +++ b/src/views/modules/other-inout/otherInboundDetail.vue @@ -674,7 +674,9 @@ export default { printerName = printerConfig.printerName; console.log('使用用户配置的打印机:', printerName); } else { - console.log('未找到用户打印机配置，使用默认打印机'); + console.warn('未找到用户打印机配置，跳过打印'); + this.$message.warning('未配置用户打印机，请在系统中配置默认打印机后再打印'); + return; } // 4. 执行打印