From 3657dff2ef3c540c04059dd37dedc904f94799d8 Mon Sep 17 00:00:00 2001 From: jiayang yue Date: Mon, 9 Jun 2025 18:49:53 +0800 Subject: [PATCH] =?UTF-8?q?2025.06.09=20=E6=A0=87=E7=AD=BE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD=20=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=A9=BA=E7=99=BD=E9=A1=B5=E3=80=81=E5=8D=B7=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/printFormat/RF_RFID.js | 4 +- src/printFormat/alphaHardTagPrintFormat.js | 4 +- src/printFormat/antenna.js | 4 +- src/printFormat/hardwareAntennaAutoSN.js | 4 +- src/printFormat/logisticLabel.js | 4 +- src/printFormat/roll_label.js | 31 ++-- src/store/modules/user.js | 8 + src/views/main.vue | 18 +++ src/views/modules/factory/tblbasedata.vue | 83 +++++++--- src/views/modules/label/QrCode.vue | 2 +- src/views/modules/label/labelMaintenance.vue | 7 + src/views/modules/label/printer.vue | 157 +++++++++++++------ src/views/modules/label/roll.vue | 72 +++++++-- 13 files changed, 293 insertions(+), 105 deletions(-) diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js index 222641e..14fa238 100644 --- a/src/printFormat/RF_RFID.js +++ b/src/printFormat/RF_RFID.js @@ -37,7 +37,7 @@ export const printRF_RFIDLabel = (printList, icons, printerName,testFlag = false const printFun = (LODOP,row,icons)=>{ LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); - LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE(7, 30 ,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(4,255,90,16,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); @@ -110,7 +110,7 @@ const printFun = (LODOP,row,icons)=>{ const printVerticalFun = (LODOP,row,icons)=>{ LODOP.SET_PRINT_PAGESIZE(0,512,1000,""); - LODOP.ADD_PRINT_IMAGE(257,1,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE(264,2,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(120,4,90,16,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js index 5935d22..cc9844d 100644 --- a/src/printFormat/alphaHardTagPrintFormat.js +++ b/src/printFormat/alphaHardTagPrintFormat.js @@ -70,7 +70,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag) { const printCartonLabel = (LODOP,row,icons,hz) => { //如果打印正常的标签 LODOP.SET_PRINT_PAGESIZE(hz, 1100, 512, '') - LODOP.ADD_PRINT_IMAGE(-5, 20, '26mm', '26mm', row.qrCode) + LODOP.ADD_PRINT_IMAGE(7, 30, '20mm', '20mm', row.qrCode) LODOP.SET_PRINT_STYLEA(0, 'Stretch', 1) LODOP.ADD_PRINT_IMAGE(4, 255, 90, 16, '') LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) @@ -181,7 +181,7 @@ const printCartonLabel = (LODOP,row,icons,hz) => { const printCartonVerticalLabel = (LODOP,row,icons) => { //如果打印正常的标签 LODOP.SET_PRINT_PAGESIZE(0, 512, 1020, '') - LODOP.ADD_PRINT_IMAGE(257,-6, '26mm', '26mm', row.qrCode) + LODOP.ADD_PRINT_IMAGE(264,2, '20mm', '20mm', row.qrCode) LODOP.SET_PRINT_STYLEA(0, 'Stretch', 1) LODOP.ADD_PRINT_IMAGE(120,4, 90, 16, '') LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js index a76d960..d1c0304 100644 --- a/src/printFormat/antenna.js +++ b/src/printFormat/antenna.js @@ -61,7 +61,7 @@ export const printAntennaLabel = (printList, icons, printerName,flag,testFlag = const printLabel = (LODOP,row,icons,hz)=>{ LODOP.SET_PRINT_PAGESIZE(hz, 1100, 512, '') - LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE(7, 30 ,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(4,255,90,16, '') LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) @@ -140,7 +140,7 @@ const printLabel = (LODOP,row,icons,hz)=>{ const printVerticalLabel = (LODOP,row,icons)=>{ LODOP.SET_PRINT_PAGESIZE(0, 512,1020 , '') - LODOP.ADD_PRINT_IMAGE(257,-3,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE(264,2,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(120,4,90,16, '') LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) diff --git a/src/printFormat/hardwareAntennaAutoSN.js b/src/printFormat/hardwareAntennaAutoSN.js index f55f61f..23f5252 100644 --- a/src/printFormat/hardwareAntennaAutoSN.js +++ b/src/printFormat/hardwareAntennaAutoSN.js @@ -17,7 +17,7 @@ export const printAntennaAutoSNLabel = (printList) => { const LODOP = getLodop() if (LODOP) { // LODOP.SET_LICENSES('', '13F0BF6589BB32F360918E33F9C10905', '', '') - LODOP.SET_LICENSES("","549DA0AD145DA11D8FC8654C58657B8EA09","",""); + LODOP.SET_LICENSES("", "549DA0AD145DA11D8FC8654C58657B8EA09", "", ""); LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名 for (let i = 0; i < printList.length; i++) { @@ -71,7 +71,7 @@ export const printAntennaAutoSNLabel = (printList) => { } const printLabel = (LODOP,row,icons,sizeTop)=>{ - LODOP.ADD_PRINT_IMAGE((sizeTop)+(-5),20,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE((sizeTop)+8,22,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE((sizeTop)+4,255,90,16, '') LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) diff --git a/src/printFormat/logisticLabel.js b/src/printFormat/logisticLabel.js index 85fe386..8e3f94d 100644 --- a/src/printFormat/logisticLabel.js +++ b/src/printFormat/logisticLabel.js @@ -35,7 +35,7 @@ export const printLogisticLabel = (printList, printerName,testFlag = false) => { const printFun = (LODOP,row)=>{ LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); - LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE(7, 30 ,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(4,255,90,16,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); @@ -101,7 +101,7 @@ const printFun = (LODOP,row)=>{ } const printVerticalFun = (LODOP,row)=>{ LODOP.SET_PRINT_PAGESIZE(0,512,1020,""); - LODOP.ADD_PRINT_IMAGE(257,1,"26mm","26mm",row.qrCode); + LODOP.ADD_PRINT_IMAGE(264,2,"20mm","20mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(120,4,90,16,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js index 4e73f16..523ac31 100644 --- a/src/printFormat/roll_label.js +++ b/src/printFormat/roll_label.js @@ -2,11 +2,12 @@ import getLodop from '@/utils/LodopFuncs.js' const ckpLogo = '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' -export const print_roll_label = (printList,printerName,testFlag = false)=>{ +export const print_roll_label = (printList,printerName,copies,testFlag = false)=>{ const LODOP = getLodop() if (LODOP){ LODOP.SET_LICENSES("","549DA0AD145DA11D8FC8654C58657B8EA09","",""); LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页') + LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE", false); for (let i = 0; i < printList.length; i++) { let row = printList[i] let direction = '' @@ -21,22 +22,22 @@ export const print_roll_label = (printList,printerName,testFlag = false)=>{ if (direction === 'Vertical'){ LODOP.PRINT_INITA(offsetX,offsetY,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - prePrintVerticalLabel(LODOP,row) + prePrintVerticalLabel(LODOP,row,copies) }else { LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - prePrintLabel(LODOP,row,0) + prePrintLabel(LODOP,row,0,copies) } }else { if (direction === 'Vertical'){ LODOP.PRINT_INITA(offsetX,offsetY,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - printVerticalLabel(LODOP,row); + printVerticalLabel(LODOP,row,copies); }else { LODOP.PRINT_INITA(offsetY,offsetX,1100,512) LODOP.SET_PRINTER_INDEXA(printerName) - printLabel(LODOP,row,0) + printLabel(LODOP,row,0,copies) } } // LODOP.PRINT_DESIGN() @@ -45,9 +46,10 @@ export const print_roll_label = (printList,printerName,testFlag = false)=>{ } -const prePrintVerticalLabel = (LODOP,row)=>{ +const prePrintVerticalLabel = (LODOP,row,copies)=>{ LODOP.SET_PRINT_PAGESIZE(0, 205, 470, ""); - LODOP.ADD_PRINT_IMAGE(103, 4, "18mm", "18mm",row.qrCode); + LODOP.SET_PRINT_COPIES(Number(copies) ? Number(copies) : 1); + LODOP.ADD_PRINT_IMAGE(108,5,"16mm","16mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0, "Stretch", 1); LODOP.ADD_PRINT_IMAGE(40, 7, 30, 8, ""); LODOP.SET_PRINT_STYLEA(0, "Stretch", 2); @@ -144,9 +146,10 @@ const prePrintVerticalLabel = (LODOP,row)=>{ LODOP.PRINT(); } -function prePrintLabel(LODOP,row,hz=0){ +function prePrintLabel(LODOP,row,hz=0,copies){ LODOP.SET_PRINT_PAGESIZE(hz,470,205,""); - LODOP.ADD_PRINT_IMAGE(3,4,"18mm","18mm",row.qrCode); + LODOP.SET_PRINT_COPIES(Number(copies) ? Number(copies) : 1); + LODOP.ADD_PRINT_IMAGE(7,4,"16mm","16mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",1); LODOP.ADD_PRINT_IMAGE(7,120,30,8,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); @@ -227,9 +230,10 @@ function prePrintLabel(LODOP,row,hz=0){ LODOP.PRINT(); } -function printLabel(LODOP,row,hz){ +function printLabel(LODOP,row,hz,copies){ LODOP.SET_PRINT_PAGESIZE(hz,565,252,""); - LODOP.ADD_PRINT_IMAGE(-3,-3,"18mm","18mm",row.qrCode); + LODOP.SET_PRINT_COPIES(Number(copies) ? Number(copies) : 1); + LODOP.ADD_PRINT_IMAGE(4,4,"17mm","17mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.ADD_PRINT_IMAGE(1,137,62,12,""); @@ -321,9 +325,10 @@ function printLabel(LODOP,row,hz){ } -const printVerticalLabel = (LODOP,row)=>{ +const printVerticalLabel = (LODOP,row,copies)=>{ LODOP.SET_PRINT_PAGESIZE(0,265,565,""); - LODOP.ADD_PRINT_IMAGE(138,-1,"18mm","18mm",row.qrCode); + LODOP.SET_PRINT_COPIES(Number(copies) ? Number(copies) : 1); + LODOP.ADD_PRINT_IMAGE(140,3,"17mm","17mm",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.ADD_PRINT_IMAGE(67,1,62,12,""); diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 078bc05..ab99881 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -11,6 +11,8 @@ export default { authControl: '', userType: '', autoSerialNumber:'', + copiesForRollLabelFlag: '', + copies: 1, siteCode:'', showPound:'', }, @@ -42,6 +44,12 @@ export default { updateAutoSerialNumber (state,autoSerialNumber){ state.autoSerialNumber = autoSerialNumber }, + updateCopiesForRollLabelFlag (state,copiesForRollLabelFlag){ + state.copiesForRollLabelFlag = copiesForRollLabelFlag + }, + updateCopies (state, copies) { + state.copies = copies + }, updateSiteCode (state,siteCode){ state.siteCode = siteCode }, diff --git a/src/views/main.vue b/src/views/main.vue index 16b450a..f9cd29f 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -112,6 +112,22 @@ this.$store.commit('user/updateAutoSerialNumber', val) } }, + copiesForRollLabelFlag: { + get() { + return this.$store.state.user.copiesForRollLabelFlag + }, + set(val) { + this.$store.commit('user/updateCopiesForRollLabelFlag', val) + } + }, + copies: { + get() { + return this.$store.state.user.copies + }, + set(val) { + this.$store.commit('user/updateCopies', val) + } + }, siteCode:{ get() { return this.$store.state.user.siteCode @@ -160,6 +176,8 @@ this.userDisplay = data.user.userDisplay this.userType = data.user.userTypeDesc this.autoSerialNumber = data.user.autoSerialNumber + this.copiesForRollLabelFlag = data.user.copiesForRollLabelFlag + this.copies = data.user.copies this.siteCode = data.user.siteCode this.showPound = data.user.showPound } diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue index 2c935d2..1d26abb 100644 --- a/src/views/modules/factory/tblbasedata.vue +++ b/src/views/modules/factory/tblbasedata.vue @@ -28,6 +28,8 @@ let site = { buNo: '', defaultCountry:'', autoSerialNumber: '', + copiesForRollLabelFlag: 'N', + copies: 1, siteCode: '', factoryCode:'00', showPound: '', @@ -54,6 +56,8 @@ export default { ...site, active: 'Y', autoSerialNumber: 'N', + copies: 1, + copiesForRollLabelFlag: 'N', showPound: 'N', }, saveFormRules:{ @@ -276,6 +280,8 @@ export default { this.getCountryList(); this.siteForm = { ...row, + copiesForRollLabelFlag: row.copiesForRollLabelFlag ? row.copiesForRollLabelFlag : 'N', + copies: row.copies ? row.copies : 1, } this.saveVisible = true; } @@ -305,56 +311,84 @@ export default { this.$message.error(error) }) }, + // 公共copies校验方法 + async checkCopies(copies) { + if (copies > 5 && this.siteForm.copiesForRollLabelFlag === 'Y') { + try { + await this.$confirm( + 'The copies is greater than 5, are you sure to continue?', + 'Warning', + { + confirmButtonText: 'OK', + cancelButtonText: 'Cancel', + type: 'warning' + } + ); + // 用户点击了确定 + return true; + } catch (e) { + // 用户点击了取消 + return false; + } + } + return true; + }, saveSite(){ - this.$refs.siteForm.validate((valid,obj) => { - if (valid){ - if (this.siteForm.factoryCode.length !== 2 || isNaN(this.siteForm.factoryCode)){ + this.$refs.siteForm.validate(async (valid, obj) => { + if (valid) { + if (this.siteForm.factoryCode.length !== 2 || isNaN(this.siteForm.factoryCode)) { this.$message.warning("The Factory Code must be a number of length 2") return } + // 校验copies + const pass = await this.checkCopies(this.siteForm.copies); + if (!pass) return; let params = { ...this.siteForm, createBy: this.$store.state.user.name, createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), } - saveSite(params).then(({data})=>{ - if (data && data.code === 0){ + saveSite(params).then(({data}) => { + if (data && data.code === 0) { this.getSiteList(); this.saveVisible = false; this.$message.success(data.msg) - }else { + } else { this.$message.warning(data.msg) } - }).catch((error)=>{ + }).catch((error) => { this.$message.error(error) }) - }else { + } else { this.getSaveFormErrorMessage(obj) } }) }, updateSite(){ - this.$refs.siteForm.validate((valid,obj) => { - if (valid){ - if (this.siteForm.factoryCode.length !== 2 || isNaN(this.siteForm.factoryCode)){ + this.$refs.siteForm.validate(async (valid, obj) => { + if (valid) { + if (this.siteForm.factoryCode.length !== 2 || isNaN(this.siteForm.factoryCode)) { this.$message.warning("The Factory Code must be a number of length 2") return } - updateSite(this.siteForm).then(({data})=>{ - if (data && data.code === 0){ - if (this.siteForm.siteId === this.$store.state.user.site){ - this.$store.commit('user/updateShowPound',this.siteForm.showPound) + // 校验copies + const pass = await this.checkCopies(this.siteForm.copies); + if (!pass) return; + updateSite(this.siteForm).then(({data}) => { + if (data && data.code === 0) { + if (this.siteForm.siteId === this.$store.state.user.site) { + this.$store.commit('user/updateShowPound', this.siteForm.showPound) } this.getSiteList(); this.saveVisible = false; this.$message.success(data.msg) - }else { + } else { this.$message.warning(data.msg) } - }).catch((error)=>{ + }).catch((error) => { this.$message.error(error) }) - }else { + } else { this.getSaveFormErrorMessage(obj) } }) @@ -369,6 +403,8 @@ export default { this.siteForm = { ...site, autoSerialNumber: 'N', + copiesForRollLabelFlag: 'N', + copies: 1, showPound: 'N', active: 'Y' } @@ -624,6 +660,17 @@ export default { Active + + + + + + + + Allow Specify Copies for Roll Label + +
diff --git a/src/views/modules/label/QrCode.vue b/src/views/modules/label/QrCode.vue index 1969ab8..fcd19b7 100644 --- a/src/views/modules/label/QrCode.vue +++ b/src/views/modules/label/QrCode.vue @@ -27,7 +27,7 @@ export default { }, generateQRCodeSync(text) { let base64 = '' - QRCode.toDataURL(text, { errorCorrectionLevel: 'M' }, (err, url) => { + QRCode.toDataURL(text, { errorCorrectionLevel: 'M',margin: 0 }, (err, url) => { if (err) { console.error(err) return diff --git a/src/views/modules/label/labelMaintenance.vue b/src/views/modules/label/labelMaintenance.vue index e08dd35..c47fe70 100644 --- a/src/views/modules/label/labelMaintenance.vue +++ b/src/views/modules/label/labelMaintenance.vue @@ -225,6 +225,13 @@ export default { this.$message.error("请上传图片文件"); return; } + // 判断文件类型 jpg png jpeg + const fileType = this.modalData.file.type; + const validImageTypes = ["image/jpeg", "image/png", "image/jpg"]; + if (!validImageTypes.includes(fileType)) { + this.$message.error("请上传有效的图片文件"); + return; + } this.$refs.formRef.validate(valid => { if (!valid) return; let formData = new FormData(); diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue index f20fc6f..f8be249 100644 --- a/src/views/modules/label/printer.vue +++ b/src/views/modules/label/printer.vue @@ -53,6 +53,7 @@ const printer = { orderNo: '', templateNo:'', printLabelType:0, + copies:1, } export default { name: 'printer', @@ -705,8 +706,14 @@ export default { if (status === 1){ labelList = this.labelFormatList.filter((item)=> item.labelType === 'Roll Label') this.printCurrentPart.rollsPerCarton = 1; + if (this.$store.state.user.copiesForRollLabelFlag === 'Y'){ + this.printCurrentPart.copies = this.$store.state.user.copies ? this.$store.state.user.copies : 1; + } else { + this.printCurrentPart.copies = 1; + } this.$set(this.printCurrentPart,'orderNo','') }else if (status === 0){ + this.$store.state.user.copiesForRollLabelFlag = 'N'; labelList = this.labelFormatList.filter((item)=> item.labelType === 'Shipment Carton') } if (labelList.length === 0){ @@ -1126,6 +1133,56 @@ export default { this.$message.error(error) }) }, + doPrintRollLabel(data, params) { + if (data && data.code === 0) { + let labelList = this.labelFormatList.filter(item => item.labelType === 'Roll Label'); + let prints = data.rows.map((item) => { + return { + qrCode: `(00)${item.partNo}(01)${item.qtyPerRoll}(02)${item.umName}(03)${item.manufacturerDate}(04)${item.serialNumber ? item.serialNumber : ''}(05)${item.manufacturerNo ? item.manufacturerNo : ''}(06)${item.moldCode ? item.moldCode : ''}(07)(08)${item.rollNo}(09)(10)`, + ref: item.partNo, + rev: item.rev, + qty: item.qtyPerRoll, + uom: item.umName, + desc: item.partDesc, + date: item.manufacturerDate, + manufacturer: item.manufacturerNo, + moldCode: item.moldCode, + rollNo: item.rollNo, + sn: item.serialNumber, + rollLabelRequired: item.rollLabelRequired, + serialNumberRequired: item.serialNumberRequired, + serialNumber: item.serialNumber, + rollLabelFlag: item.rollLabelFlag, // 判断标签类型 + offsetX: item.offsetX, + offsetY: item.offsetY, + direction: item.direction, + } + }); + let qrCodeList = this.$refs.qrCode.init(prints.map((item) => { + return item.qrCode + })); + for (let i = 0; i < qrCodeList.length; i++) { + prints[i].qrCode = qrCodeList[i]; + } + let notFound = []; + for (let label of labelList) { + if (!this.printerSetupList.includes(label.defaultPrinterName)) { + notFound.push(label.defaultPrinterName); + continue; + } + print_roll_label(prints, label.defaultPrinterName, params.copies, true); + } + this.printTest = false; + if (notFound.length > 0) { + this.$message.warning(`The printer ${notFound.join(',')} is not found`); + return; + } + this.$message.success(data.msg); + } else { + this.$message.warning(data.msg); + } + this.printLoading = false; + }, savePrintRollLabelRecord(){ // 新增 打印记录 let params = { @@ -1136,59 +1193,34 @@ export default { } this.printLoading = true; // 请求接口 - savePrintRollLabelRecord(params).then(({data})=>{ - if (data && data.code === 0) { - let labelList = this.labelFormatList.filter((item)=> item.labelType === 'Roll Label') - let prints = data.rows.map((item) => { - return { - qrCode: `(00)${item.partNo}(01)${item.qtyPerRoll}(02)${item.umName}(03)${item.manufacturerDate}(04)${item.serialNumber? item.serialNumber : ''}(05)${item.manufacturerNo? item.manufacturerNo : ''}(06)${item.moldCode? item.moldCode : ''}(07)(08)${item.rollNo}(09)(10)`, - ref: item.partNo, - rev: item.rev, - qty: item.qtyPerRoll, - uom: item.umName, - desc: item.partDesc, - date: item.manufacturerDate, - manufacturer: item.manufacturerNo, - moldCode: item.moldCode, - rollNo: item.rollNo, - sn: item.serialNumber, - rollLabelRequired: item.rollLabelRequired, - serialNumberRequired: item.serialNumberRequired, - serialNumber: item.serialNumber, - rollLabelFlag: item.rollLabelFlag,// 判断标签类型 - offsetX:item.offsetX, - offsetY:item.offsetY, - direction:item.direction, + + savePrintRollLabelRecord(params).then(async ({data}) => { + await this.onCopiesInput(params.copies); + // 校验copies + if (params.copies > 5) { + this.$confirm( + 'The copies is greater than 5, are you sure to continue?', + 'Warning', + { + confirmButtonText: 'OK', + cancelButtonText: 'Cancel', + type: 'warning' } + ).then(() => { + // 用户确认，执行后续打印逻辑 + this.doPrintRollLabel(data, params); + }).catch(() => { + // 用户取消 + this.printLoading = false; }); - let qrCodeList = this.$refs.qrCode.init(prints.map((item)=>{ - return item.qrCode - })) - for (let i = 0; i < qrCodeList.length; i++) { - prints[i].qrCode = qrCodeList[i] - } - let notFound = []; - for (let label of labelList) { - if (!this.printerSetupList.includes(label.defaultPrinterName)) { - notFound.push(label.defaultPrinterName) - continue - } - print_roll_label(prints,label.defaultPrinterName,true) - } - this.printTest = false - if (notFound.length > 0){ - this.$message.warning(`The printer ${notFound.join(',')} is not found`) - return - } - this.$message.success(data.msg) - }else { - this.$message.warning(data.msg) + return; // 阻断后续 } + // 如果copies不大于5，直接执行 + this.doPrintRollLabel(data, params); + }).catch((error) => { + this.$message.error(error); this.printLoading = false; - }).catch((error)=>{ - this.$message.error(error) - this.printLoading = false; - }) + }); }, loadQrCode(){ let arr = ['2','4','6','8'] @@ -1416,7 +1448,15 @@ export default { handleScanSerialNumber(){ this.scanSerialNumberList = [...this.serialNumberList] this.serialNumberVisible = true - } + }, + onCopiesInput(val) { + // 只允许正整数 + let newVal = String(val).replace(/[^0-9]/g, ''); + if (newVal === '' || Number(newVal) < 1) { + newVal = '1'; + } + this.printCurrentPart.copies = parseInt(newVal, 10); + }, }, mounted () { this.getLodopPrinterName(); @@ -1684,7 +1724,22 @@ export default { -
+
+ + + Print + + Cancel +
+
Print Cancel
diff --git a/src/views/modules/label/roll.vue b/src/views/modules/label/roll.vue index 2056a78..e77ea42 100644 --- a/src/views/modules/label/roll.vue +++ b/src/views/modules/label/roll.vue @@ -23,7 +23,8 @@ const printRecord = { partNo: '', partDesc: '', startDate: '', - endDate: '' + endDate: '', + copies: 1, } export default { name: 'roll', @@ -335,15 +336,37 @@ export default { let ids = this.selectionPrintLabelRecordList.map((item) => { return item.id }) - getPrintRollLabelRecord(ids).then(({data})=>{ - if (data && data.code === 0){ - this.handlePrint(data.rows) - }else { - this.$message.warning(data.msg) + + // 校验全局 copies + if (Number(this.printRecord.copies) > 5) { + try { + await this.$confirm( + 'The copies is greater than 5, are you sure to continue?', + 'Warning', + { + confirmButtonText: 'OK', + cancelButtonText: 'Cancel', + type: 'warning' + } + ); + // 用户点击OK，则继续 + } catch (e) { + // 用户点击取消 + return; } - }).catch((error)=>{ - this.$message.error(error.message) - }) + } + + // 获取数据并继续后续逻辑 + try { + const { data } = await getPrintRollLabelRecord(ids); + if (data && data.code === 0) { + this.handlePrint(data.rows); + } else { + this.$message.warning(data.msg); + } + } catch (error) { + this.$message.error(error.message); + } }, handlePrint(list){ let params = list.map((item) => { @@ -392,7 +415,7 @@ export default { for (let i = 0; i < qrCodeList.length; i++) { arr[i].qrCode = qrCodeList[i] } - print_roll_label(arr,printerNameList[j].defaultPrinterName,true) + print_roll_label(arr,printerNameList[j].defaultPrinterName,this.printRecord.copies,true) } } this.printTest = false @@ -508,7 +531,15 @@ export default { handlePrintTest(){ this.printTest = true this.handlePrintLabel(); - } + }, + onCopiesInput(val) { + // 只允许正整数 + let newVal = String(val).replace(/[^0-9]/g, ''); + if (newVal === '' || Number(newVal) < 1) { + newVal = '1'; + } + this.printRecord.copies = parseInt(newVal, 10); + }, }, mounted () { const lodop = getLodop() @@ -519,6 +550,11 @@ export default { created () { // this.getPrintLabelRecordList() this.getTableUserColumn('30006Table',1) + if (this.$store.state.user.copiesForRollLabelFlag === 'Y') { + this.printRecord.copies = this.$store.state.user.copies ? this.$store.state.user.copies : 1 + } else { + this.printRecord.copies = 1 + } }, } @@ -582,13 +618,25 @@ export default { - + Query Print + + + + +