From f58182be79cca5265c148f415ad2a31a6caf784e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 20 Jan 2026 17:12:07 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-20=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/label-split-merge/label-split-merge.js | 2 +- src/utils/LodopFuncs.js | 12 ++++++++---- .../modules/label-split-merge/labelSplitMerge.vue | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/api/label-split-merge/label-split-merge.js b/src/api/label-split-merge/label-split-merge.js index fb732eb..f9765a1 100644 --- a/src/api/label-split-merge/label-split-merge.js +++ b/src/api/label-split-merge/label-split-merge.js @@ -47,4 +47,4 @@ export const mergeLabel = data => createAPI(`label-split-merge/merge`, 'post', d * @param {string} data.username - 用户名 * @param {string} data.labelNo - 标签模板编号 */ -export const getUserDefaultPrinter = data => createAPI(`otherInbound/getUserDefaultPrinter`, 'post', data) \ No newline at end of file +export const getUserDefaultPrinter = data => createAPI(`otherInbound/getUserDefaultPrinter`, 'post', data) diff --git a/src/utils/LodopFuncs.js b/src/utils/LodopFuncs.js index 1c525de..fc50658 100644 --- a/src/utils/LodopFuncs.js +++ b/src/utils/LodopFuncs.js @@ -2,13 +2,17 @@ import { MessageBox } from 'element-ui' //用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占: +//==打印服务器IP地址配置（需要在该服务器上安装并运行C-Lodop服务）== +var PrintServerIP = "10.1.15.53"; // 打印服务器IP，修改此处即可 +//var PrintServerIP = "192.168.1.83"; // 打印服务器IP，修改此处即可 var MainJS = "CLodopfuncs.js", - URL_WS1 = "ws://10.1.15.53:8000/" + MainJS, //ws用8000/18000 - URL_WS2 = "ws://10.1.15.53:18000/" + MainJS, + URL_WS1 = "ws://" + PrintServerIP + ":8000/" + MainJS, //ws用8000/18000 + URL_WS2 = "ws://" + PrintServerIP + ":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, + // 注意：HTTP地址也需要指向打印服务器，而不是localhost（PDA设备上没有LODOP） + URL_HTTP1 = "http://" + PrintServerIP + ":8000/" + MainJS, //http用8000/18000 + URL_HTTP2 = "http://" + PrintServerIP + ":18000/" + MainJS, URL_HTTP3 = "https://localhost.lodop.net:8443/" + MainJS; //https用8000/8443 var CreatedOKLodopObject, CLodopIsLocal, LoadJsState; diff --git a/src/views/modules/label-split-merge/labelSplitMerge.vue b/src/views/modules/label-split-merge/labelSplitMerge.vue index b107f8e..78c6f68 100644 --- a/src/views/modules/label-split-merge/labelSplitMerge.vue +++ b/src/views/modules/label-split-merge/labelSplitMerge.vue @@ -215,7 +215,7 @@ export default { const splitQty = parseFloat(this.splitQuantity); const currentQty = parseFloat(this.currentLabel.qtyOnHand); const totalSplitQty = splitCnt * splitQty; - + if (!splitCnt || splitCnt <= 0) { this.$message.warning('请输入有效的拆分张数'); return;