diff --git a/src/api/label/printRollLabelRecord.js b/src/api/label/printRollLabelRecord.js
index 441afe4..0660038 100644
--- a/src/api/label/printRollLabelRecord.js
+++ b/src/api/label/printRollLabelRecord.js
@@ -2,3 +2,4 @@ import {createAPI} from '../../utils/httpRequest'
export const getPrintRollLabelRecordPage = (data,no,size) => createAPI(`/label/print/roll/record/page/${no}/${size}`,'post',data)
export const savePrintRollLabelRecord = (data) => createAPI(`/label/print/roll/record/save`,'post',data)
+export const getPrintRollLabelRecord = (data) => createAPI(`/label/print/roll/record`,'post',data)
diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index 304642e..e6cbf71 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -14,6 +14,7 @@ export const print_roll_label = (printList,printerName)=>{
LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')
for (let i = 0; i < printList.length; i++) {
let row = printList[i];
+ console.log(row)
LODOP.NewPage();
LODOP.ADD_PRINT_IMAGE(2,-2,"20mm","20mm",`
`);
LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
@@ -60,11 +61,16 @@ export const print_roll_label = (printList,printerName)=>{
LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
- LODOP.ADD_PRINT_TEXT(58,78,30,20,"ROLL");
- LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
- LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
- LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
+ if (row.rollLabelRequired === 'Y'){
+ LODOP.ADD_PRINT_TEXT(58,78,30,20,"ROLL");
+ }else if (row.serialNumberRequired === 'Y'){
+ LODOP.ADD_PRINT_TEXT(58,78,50,20,"SERIAL");
+ }
+ if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
+ LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ }
LODOP.ADD_PRINT_TEXT(66,78,29,15,"DATE");
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
@@ -76,10 +82,16 @@ export const print_roll_label = (printList,printerName)=>{
LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
- LODOP.ADD_PRINT_TEXT(58,100,80,20,row.rollNo);
- LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
- LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
- LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ if (row.rollLabelRequired === 'Y'){
+ LODOP.ADD_PRINT_TEXT(58,100,80,20,row.rollNo);
+ }else if (row.serialNumberRequired === 'Y'){
+ LODOP.ADD_PRINT_TEXT(58,105,80,20,row.serialNumber);
+ }
+ if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
+ LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ }
LODOP.PRINT();
}
}
diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue
index 83845f9..c4ca7c6 100644
--- a/src/views/modules/label/printer.vue
+++ b/src/views/modules/label/printer.vue
@@ -839,6 +839,9 @@ export default {
moldCode: item.moldCode,
rollNo: item.rollNo,
sn: item.serialNumber,
+ rollLabelRequired: item.rollLabelRequired,
+ serialNumberRequired: item.serialNumberRequired,
+ serialNumber: item.serialNumber,
}
});
let qrCodeList = this.$refs.qrCode.init(prints.map((item)=>{
@@ -941,7 +944,8 @@ export default {
Print-Carton Label
- Print-Roll Label
+
+ Print-Roll Label
diff --git a/src/views/modules/label/roll.vue b/src/views/modules/label/roll.vue
index 3bbbaac..f54ac52 100644
--- a/src/views/modules/label/roll.vue
+++ b/src/views/modules/label/roll.vue
@@ -13,7 +13,7 @@ import {
} from '../../../api/label/labelFormatUserDefault'
import getLodop from '@/utils/LodopFuncs.js'
import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table'
-import {getPrintRollLabelRecordPage} from '../../../api/label/printRollLabelRecord'
+import {getPrintRollLabelRecord, getPrintRollLabelRecordPage} from '../../../api/label/printRollLabelRecord'
import QrCode from './QrCode.vue'
import {print_roll_label} from '../../../printFormat/roll_label'
@@ -331,7 +331,21 @@ export default {
this.$message.warning('please select record')
return
}
- let params = this.selectionPrintLabelRecordList.map((item) => {
+ 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)
+ }
+ }).catch((error)=>{
+ this.$message.error(error.message)
+ })
+ },
+ handlePrint(list){
+ let params = list.map((item) => {
return {
site:item.site,
partNo:item.partNo,
@@ -341,42 +355,49 @@ export default {
category:item.category,
}
})
- let {data} = await getRollPrinterNameList(params)
- if (data && data.code === 0){
- for (let i = 0; i < this.selectionPrintLabelRecordList.length; i++) {
- let record = this.selectionPrintLabelRecordList[i]
- let printerNameList = data.rows[i].filter((item)=> item.labelType === 'Roll Label')
- let arr = []
- arr.push(record)
- for (let j = 0; j < printerNameList.length; j++) {
- arr = arr.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}`,
- 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,
+ getRollPrinterNameList(params).then(({data})=>{
+ if (data && data.code === 0){
+ for (let i = 0; i < this.selectionPrintLabelRecordList.length; i++) {
+ let record = this.selectionPrintLabelRecordList[i]
+ let printerNameList = data.rows[i].filter((item)=> item.labelType === 'Roll Label')
+ let arr = []
+ arr.push(record)
+ for (let j = 0; j < printerNameList.length; j++) {
+ arr = arr.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}`,
+ 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,
+ }
+ })
+ let qrCodeList = this.$refs.qrCode.init(arr.map((item)=>{
+ return item.qrCode
+ }))
+ for (let i = 0; i < qrCodeList.length; i++) {
+ arr[i].qrCode = qrCodeList[i]
}
- })
- let qrCodeList = this.$refs.qrCode.init(arr.map((item)=>{
- return item.qrCode
- }))
- for (let i = 0; i < qrCodeList.length; i++) {
- arr[i].qrCode = qrCodeList[i]
+ print_roll_label(arr,printerNameList[j].defaultPrinterName)
}
- print_roll_label(arr,printerNameList[j].defaultPrinterName)
+ this.$message.success(data.msg)
}
- this.$message.success(data.msg)
+ }else {
+ this.$message.warning(data.msg)
}
- }else {
- this.$message.warning(data.msg)
- }
+ }).catch((error)=>{
+ this.$message.error(error.message)
+ })
+
},
printLabel(pictureList,formatList){
let prints = this.selectionPrintLabelRecordList.map((item) => {
@@ -394,7 +415,6 @@ export default {
sn: item.serialNumber,
}
})
-
let notFound = [];
for (let i = 0; i < prints.length; i++) {
let print = prints[i]
diff --git a/static/config/index-prod.js b/static/config/index-prod.js
index b252a70..edd4fa1 100644
--- a/static/config/index-prod.js
+++ b/static/config/index-prod.js
@@ -7,7 +7,7 @@
// api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9008';// 客户
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.254.12:9008/';// 客户
- window.SITE_CONFIG['baseUrl'] = 'http://qrcode.checkpt.com:9008/';// 客户
+ window.SITE_CONFIG['baseUrl'] = '/api';// 客户
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:8086';// 83
// cdn地址 = 域名 + 版本号