From 87770b9dccf1b07c1d862558edffa224baf21307 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Thu, 12 Oct 2023 18:01:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/print.js | 16 ++++++++-------- .../goodsAllocation/BasicdataGoodsAllocation.vue | 2 +- vite/plugins/index.js | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/utils/print.js b/src/utils/print.js index fcc8fe03..97b2a577 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -13,18 +13,18 @@ const point = nodeList => { // 当列表内没有元素时, 退出函数 if (nodeList.length === 0) return; + LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能'); + LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500'); + LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出,且英文单词拆开 + // // 设置打印整宽且不变形 + LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width'); + // // 设置打印后自动关闭 + LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); // 循环列表内元素并打印 nodeList.forEach(orderNode => { let templateData = orderNode.innerHTML; - LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能'); - LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500'); - LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出,且英文单词拆开 - // // 设置打印整宽且不变形 - LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width'); - // // 设置打印后自动关闭 - LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); // // data就是一段html文本 - LODOP.ADD_PRINT_HTM('20', '0%', '100%', '100%', templateData); + LODOP.ADD_PRINT_HTM('45', '0%', '100%', '100%', templateData); // LODOP.PREVIEW(); //预览(预览打印无脚标) LODOP.PRINT(); //直接打印 }); diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue index ee3116d8..365eb76c 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue @@ -418,7 +418,7 @@ export default { // // 设置打印后自动关闭 LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); // // data就是一段html文本 - LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData); + LODOP.ADD_PRINT_HTM('40', '0%', '100%', '100%', templateData); // LODOP.PREVIEW(); //预览(预览打印无脚标) LODOP.PRINT(); //直接打印 }, diff --git a/vite/plugins/index.js b/vite/plugins/index.js index 03bc9ae1..9a9b744f 100644 --- a/vite/plugins/index.js +++ b/vite/plugins/index.js @@ -9,7 +9,8 @@ export default function createVitePlugins(viteEnv, isBuild = false) { const vitePlugins = [vue()]; vitePlugins.push(createAutoImport()); vitePlugins.push(createSetupExtend()); - vitePlugins.push(createSetupMock()); + // 取消对mockJS的加载 + // vitePlugins.push(createSetupMock()); isBuild && vitePlugins.push(...createCompression(viteEnv)); return vitePlugins; } From 97ed2bd02f610ba9a9235cfde838bd21fbff2bd9 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 12 Oct 2023 18:21:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/createTask.js | 33 ++ .../checkInventoryTask/createTask.vue | 335 ++++++++++++++---- 2 files changed, 306 insertions(+), 62 deletions(-) diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js index 9a5419de..0b83f762 100644 --- a/src/api/distribution/createTask.js +++ b/src/api/distribution/createTask.js @@ -10,4 +10,37 @@ export const getDictList = params => { method: 'get', params, }); +}; + +/** + * 添加盘点任务 + */ +export const postAddtaskQuest = data => { + return request({ + url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/save', + method: 'post', + data, + }); +}; + +/** + * 获取盘点列表 + */ +export const getTaskQuestPage = params => { + return request({ + url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/page', + method: 'get', + params, + }); +}; + +/** + * 编辑盘点任务 + */ +export const postEditTaskQuestUpdate = data => { + return request({ + url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/update', + method: 'post', + data, + }); }; \ No newline at end of file diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index 75567029..e3c8cc89 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -1,8 +1,8 @@ + +
勾选数量: {{ selectionList.length }}
- + - - - - - - + + +