From e16031a86b3ae260c755a11afa19cf9df2cc438f Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Sun, 15 May 2022 14:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=202022-05-15=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/print/outBoxPrint.js | 19 + src/api/print/print.js | 2 +- src/utils/decimalUtil.js | 30 +- src/views/modules/common/print-list.vue | 25 +- src/views/modules/common/user-print-list.vue | 26 +- .../labelPrint/outer-box-label-roll.vue | 701 ++++++++++++++++++ .../modules/labelPrint/outer-box-label.vue | 694 +++++++++++++++++ src/views/modules/oss/oss1.vue | 173 +++++ 8 files changed, 1649 insertions(+), 21 deletions(-) create mode 100644 src/api/print/outBoxPrint.js create mode 100644 src/views/modules/labelPrint/outer-box-label-roll.vue create mode 100644 src/views/modules/labelPrint/outer-box-label.vue create mode 100644 src/views/modules/oss/oss1.vue diff --git a/src/api/print/outBoxPrint.js b/src/api/print/outBoxPrint.js new file mode 100644 index 0000000..28b4a51 --- /dev/null +++ b/src/api/print/outBoxPrint.js @@ -0,0 +1,19 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// 根据订单获取打印数据 +export const getBoxLabelSO = data => createAPI(`/outBoxPrint/getBoxLabelSO/${data}`,'get') + +// 根据卷号获取 打印数据 +export const getBoxLabelSOByRollNo = data => createAPI(`/outBoxPrint/getBoxLabelSOByRollNo/${data}`,'get') + +// 获取可用模板列表 +export const getReportFileByCustomer = data => createAPI(`/outBoxPrint/getReportFileByCustomer/${data.customerId}/${data.reportFamily}`,'get') + +// 获取子模版列表 +export const getReportSubFileList = data => createAPI(`/outBoxPrint/getReportSubFileList`,'post',data) + +// 获取模板手工参数 +export const getReportParameters = data => createAPI(`/outBoxPrint/getReportParameters/${data}`,'get') + +// 打印 +export const ouBoxPrintLabel = data => createAPI(`/outBoxPrint/ouBoxPrintLabel`,'post',data) diff --git a/src/api/print/print.js b/src/api/print/print.js index 8123931..f363312 100644 --- a/src/api/print/print.js +++ b/src/api/print/print.js @@ -1,7 +1,7 @@ import { createAPI } from "@/utils/httpRequest.js"; // 获取用户打印机 -export const getUserLabelPrintList = data => createAPI(`/sysUserPrinter/getUserPrint/${data.userName}`,'get') +export const getUserLabelPrintList = data => createAPI(`/sysUserPrinter/getUserPrintReportList`,'post',data) // 保存用户打印机 export const saveUserLabelPrint = data => createAPI('/sysUserPrinter/saveUserLabelPrint','post',data) diff --git a/src/utils/decimalUtil.js b/src/utils/decimalUtil.js index a0d09f9..3ced5ed 100644 --- a/src/utils/decimalUtil.js +++ b/src/utils/decimalUtil.js @@ -1,6 +1,17 @@ -import { Decimal } from "decimal.js"; +import {Decimal} from "decimal.js"; // args第一位为被操作数据 +//保留小数向上取整 +function formatUp(num, len) { + return new Decimal(num).toDecimalPlaces(len, Decimal.ROUND_UP).toString() +} + + +//保留小数向下取整 +function formatDown(num, len) { + return new Decimal(num).toDecimalPlaces(len, Decimal.ROUND_DOWN).toNumber() +} + //加法 function add(...args) { let result = new Decimal(args[0]); @@ -9,6 +20,7 @@ function add(...args) { } return result.toNumber(); } + //减法 function sub(...args) { let result = new Decimal(args[0]); @@ -17,6 +29,7 @@ function sub(...args) { } return result.toNumber(); } + //乘法 function mul(...args) { let result = new Decimal(args[0]); @@ -25,6 +38,7 @@ function mul(...args) { } return result.toNumber(); } + //除法 function div(...args) { let result = new Decimal(args[0]); @@ -34,9 +48,21 @@ function div(...args) { return result.toNumber(); } +//取余 +function mod(...args) { + let result = new Decimal(args[0]); + for (let i = 1; i < args.length; i++) { + result = result.modulo(new Decimal(args[i])); + } + return result.toNumber(); +} + export default { + formatUp, + formatDown, add, sub, mul, - div + div, + mod }; diff --git a/src/views/modules/common/print-list.vue b/src/views/modules/common/print-list.vue index 7128c85..97e173a 100644 --- a/src/views/modules/common/print-list.vue +++ b/src/views/modules/common/print-list.vue @@ -10,13 +10,15 @@ - + - + - + @@ -49,10 +51,11 @@ export default { title: '用户打印机管理', visible: false, userPrint: { - printerName: '', - userId: this.$store.state.user.name, - ipAddress: '', - labelName: '', + printername: '', + userid: this.$store.state.user.name, + ipaddress: '', + reportid: '', + reportFile: '', }, printList: [], buttons: { @@ -69,11 +72,14 @@ export default { }) }, methods: { + selectBlur(e){ + this.userPrint.printername = e.target.value + }, // 初始化 init(val) { this.visible = true this.userPrint = val - this.userPrint.ipAddress = val.ipAddress?val.ipAddress: '127.0.0.1' + this.userPrint.ipaddress = val.ipaddress?val.ipaddress: '127.0.0.1' this.getPrintName() }, // 获取所有打印机 @@ -83,7 +89,6 @@ export default { var elementById = this.$refs.printElement; lodop.Create_Printer_List(elementById) setTimeout(()=>{},1000) - console.log(elementById) var children = elementById.children let list = [] for (let child of children) { @@ -100,7 +105,7 @@ export default { // 保存打印机 savePrint(){ - this.userPrint.userId = this.$store.state.user.name + this.userPrint.userid = this.$store.state.user.name saveUserLabelPrint(this.userPrint).then(({data}) =>{ if (data.code === 0){ this.$message.success(data.msg) diff --git a/src/views/modules/common/user-print-list.vue b/src/views/modules/common/user-print-list.vue index b3db153..e8a7a6c 100644 --- a/src/views/modules/common/user-print-list.vue +++ b/src/views/modules/common/user-print-list.vue @@ -8,6 +8,14 @@ width="955px" :append-to-body="true"> + + + + + + {{ buttons.select }} + + { if (data.code === 0) { diff --git a/src/views/modules/labelPrint/outer-box-label-roll.vue b/src/views/modules/labelPrint/outer-box-label-roll.vue new file mode 100644 index 0000000..d8352ea --- /dev/null +++ b/src/views/modules/labelPrint/outer-box-label-roll.vue @@ -0,0 +1,701 @@ + + + + diff --git a/src/views/modules/labelPrint/outer-box-label.vue b/src/views/modules/labelPrint/outer-box-label.vue new file mode 100644 index 0000000..d3aee17 --- /dev/null +++ b/src/views/modules/labelPrint/outer-box-label.vue @@ -0,0 +1,694 @@ + + + + diff --git a/src/views/modules/oss/oss1.vue b/src/views/modules/oss/oss1.vue new file mode 100644 index 0000000..1472457 --- /dev/null +++ b/src/views/modules/oss/oss1.vue @@ -0,0 +1,173 @@ + + +