From a1ff46cd2834d4f5d9f5d3ba832ed9d69d5adeb7 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 24 Dec 2025 14:05:53 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-24=20pda=E6=8B=86=E5=92=8C=E7=BB=84?= =?UTF-8?q?=E6=89=98=E6=8F=90=E4=BA=A4=E6=97=B6=E8=B0=83=E7=94=A8=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../label-split-merge/label-split-merge.js | 11 +- .../label-split-merge/labelSplitMerge.vue | 137 +++++++++++++++++- 2 files changed, 144 insertions(+), 4 deletions(-) diff --git a/src/api/label-split-merge/label-split-merge.js b/src/api/label-split-merge/label-split-merge.js index 92fa073..fb732eb 100644 --- a/src/api/label-split-merge/label-split-merge.js +++ b/src/api/label-split-merge/label-split-merge.js @@ -38,4 +38,13 @@ export const splitLabel = data => createAPI(`label-split-merge/split`, 'post', d * @param {number} data.targetQuantity - 目标标签数量 * @param {number} data.sourceQuantity - 源标签数量 */ -export const mergeLabel = data => createAPI(`label-split-merge/merge`, 'post', data) \ No newline at end of file +export const mergeLabel = data => createAPI(`label-split-merge/merge`, 'post', data) + +/** + * 获取用户默认打印机配置 + * @param {Object} data - 查询参数 + * @param {string} data.site - 站点 + * @param {string} data.username - 用户名 + * @param {string} data.labelNo - 标签模板编号 + */ +export const getUserDefaultPrinter = data => createAPI(`otherInbound/getUserDefaultPrinter`, 'post', data) \ No newline at end of file diff --git a/src/views/modules/label-split-merge/labelSplitMerge.vue b/src/views/modules/label-split-merge/labelSplitMerge.vue index e4b6145..e9f6e0d 100644 --- a/src/views/modules/label-split-merge/labelSplitMerge.vue +++ b/src/views/modules/label-split-merge/labelSplitMerge.vue @@ -128,10 +128,13 @@