Browse Source

20250117

dev
qiezi 1 year ago
parent
commit
7f114d1a9e
  1. 23
      src/printFormat/RF_RFID.js
  2. 27
      src/printFormat/alphaHardTagPrintFormat.js
  3. 29
      src/printFormat/antenna.js
  4. 20
      src/printFormat/logisticLabel.js
  5. 32
      src/printFormat/roll_label.js
  6. 10
      src/views/modules/label/logisticLabelRecord.vue
  7. 202
      src/views/modules/label/printer.vue
  8. 17
      src/views/modules/label/record.vue
  9. 12
      src/views/modules/label/roll.vue
  10. 36
      src/views/modules/label/userDefault.vue
  11. 4
      src/views/modules/part/external.vue

23
src/printFormat/RF_RFID.js
File diff suppressed because it is too large
View File

27
src/printFormat/alphaHardTagPrintFormat.js

@ -15,21 +15,27 @@ const rightIndex = 'Y'
let sizeTop = 190;
export function printAlphaHardTagLabel (printList, icons, printerName, flag,hz = 0) {
export function printAlphaHardTagLabel (printList, icons, printerName, flag) {
const LODOP = getLodop()
if (LODOP) {
// LODOP.SET_LICENSES('', '13F0BF6589BB32F360918E33F9C10905', '', '')
LODOP.SET_LICENSES('', '549DA0AD145DA11D8FC8654C58657B8EA09', '', '')
if (null == printerName || printerName === '') {
console.info('未设置打印机!')
} else {
LODOP.SET_PRINTER_INDEXA(printerName)
}
LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名
//批量循环打印
for (let i = 0; i < printList.length; i++) {
let row = printList[i]
let direction = '';
let offsetX = 0;
let offsetY = 0;
if (flag === true){
direction = row.direction
offsetX = row.offsetX
offsetY = row.offsetY
}
//如果打印正常的标签
LODOP.NewPageA();
LODOP.PRINT_INITA(offsetY,offsetX,1100,512)
LODOP.SET_PRINTER_INDEXA(printerName)
if (flag === 'Y'){
if (row.printLabelType === 0){
@ -38,13 +44,13 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag,hz =
sizeTop = 0;
}
if (row.printLabelType === 0 || row.printLabelType === 1){
printCartonLabel(LODOP,row,icons,hz) // 箱标签
printCartonLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签
}
if (row.printLabelType === 0 || row.printLabelType === 2){
printProductLabel(LODOP,row,hz)
printProductLabel(LODOP,row,direction === 'Vertical'?2:0)
}
}else {
printCartonLabel(LODOP,row,icons,hz) // 箱标签
printCartonLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签
}
LODOP.PRINT()
}
@ -55,7 +61,6 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag,hz =
const printCartonLabel = (LODOP,row,icons,hz) => {
//如果打印正常的标签
LODOP.NewPageA()
LODOP.SET_PRINT_PAGESIZE(hz, 1100, 512, '')
LODOP.ADD_PRINT_IMAGE(-5, 20, '26mm', '26mm', row.qrCode)
LODOP.SET_PRINT_STYLEA(0, 'Stretch', 1)
@ -158,8 +163,6 @@ const printCartonLabel = (LODOP,row,icons,hz) => {
}
const printProductLabel = (LODOP,row,hz) =>{
console.log(row.templateNo)
// LODOP.NewPageA();
LODOP.SET_SHOW_MODE("MESSAGE_GETING_URL", "");//该语句隐藏进度条或修改提示信息
LODOP.SET_SHOW_MODE("MESSAGE_PARSING_URL", "");//该语句隐藏进度条或修改提示信息
LODOP.SET_PRINT_PAGESIZE(hz,1100,1005,"");

29
src/printFormat/antenna.js

@ -14,20 +14,26 @@ const printTop = 15
const rightIndex = 'Y'
let sizeTop = 190;
export const printAntennaLabel = (printList, icons, printerName,flag,hz = 0) => {
export const printAntennaLabel = (printList, icons, printerName,flag,testFlag = false) => {
const LODOP = getLodop()
if (LODOP) {
// LODOP.SET_LICENSES('', '13F0BF6589BB32F360918E33F9C10905', '', '')
LODOP.SET_LICENSES("","549DA0AD145DA11D8FC8654C58657B8EA09","","");
if (null == printerName || printerName === '') {
console.info('未设置打印机!')
} else {
LODOP.SET_PRINTER_INDEXA(printerName)
}
LODOP.SET_PRINTER_INDEXA(printerName)
LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名
for (let i = 0; i < printList.length; i++) {
let row = printList[i]
let direction = '';
let offsetX = 0;
let offsetY = 0;
if (testFlag){
direction = row.direction
offsetX = row.offsetX
offsetY = row.offsetY
}
//如果打印正常的标签
LODOP.NewPageA();
LODOP.PRINT_INITA(offsetY,offsetX,1100,512)
LODOP.SET_PRINTER_INDEXA(printerName)
//如果打印正常的标签
if (flag === 'Y'){
if (row.printLabelType === 0){
@ -36,13 +42,13 @@ export const printAntennaLabel = (printList, icons, printerName,flag,hz = 0) =>
sizeTop = 0;
}
if (row.printLabelType === 0 || row.printLabelType === 1){
printLabel(LODOP,row,icons,hz) // 箱标签
printLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签
}
if (row.printLabelType === 0 || row.printLabelType === 2){
printProductLabel(LODOP,row,hz)
printProductLabel(LODOP,row,direction === 'Vertical'?2:0)
}
}else {
printLabel(LODOP,row,icons,hz) // 箱标签
printLabel(LODOP,row,icons,direction === 'Vertical'?2:0) // 箱标签
}
}
//LODOP.PREVIEW();
@ -52,7 +58,6 @@ export const printAntennaLabel = (printList, icons, printerName,flag,hz = 0) =>
}
const printLabel = (LODOP,row,icons,hz)=>{
LODOP.NewPageA();
LODOP.SET_PRINT_PAGESIZE(hz, 1100, 512, '')
LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode);
LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
@ -133,8 +138,6 @@ const printLabel = (LODOP,row,icons,hz)=>{
const printProductLabel = (LODOP,row,hz) =>{
console.log(row.templateNo)
// LODOP.NewPageA();
LODOP.SET_SHOW_MODE("MESSAGE_GETING_URL", "");//该语句隐藏进度条或修改提示信息
LODOP.SET_SHOW_MODE("MESSAGE_PARSING_URL", "");//该语句隐藏进度条或修改提示信息
LODOP.SET_PRINT_PAGESIZE(hz,1100,1005,"");

20
src/printFormat/logisticLabel.js
File diff suppressed because it is too large
View File

32
src/printFormat/roll_label.js
File diff suppressed because it is too large
View File

10
src/views/modules/label/logisticLabelRecord.vue

@ -228,6 +228,7 @@ export default {
}
],
selectionDataList: [],
printTest: false
}
},
methods: {
@ -293,15 +294,21 @@ export default {
let qrCodeList = this.$refs.qrCode.init([row.qrCode])
row.qrCode = qrCodeList[0]
for (let j = 0; j < printer.length; j++) {
printLogisticLabel([row],printer[0].defaultPrinterName)
printLogisticLabel([row],printer[0].defaultPrinterName,this.printTest)
}
}
this.printTest = false
this.$refs.table.clearSelection();
}else {
this.$message.warning(data.msg)
}
}).catch((error)=>{
this.$message.error(error)
})
},
handlePrintTest () {
this.printTest = true
this.handlePrint();
}
},
watch: {
@ -382,6 +389,7 @@ export default {
<el-form-item label=" ">
<el-button type="primary" style="width: 60px" @click="handleQuery">Query</el-button>
<el-button type="primary" style="width: 60px" @click="handlePrint">Print</el-button>
<el-button type="primary" style="width: 80px" @click="handlePrintTest">Print Test</el-button>
</el-form-item>
</el-col>
</el-row>

202
src/views/modules/label/printer.vue

@ -5,7 +5,10 @@ import {getExternalPartPictureList} from '../../../api/part/externalPartPicture'
import ExternalPart from '../part/external.vue'
import CustomerInfo from '../customer/info.vue'
import {getExternalPartManufacturerList} from '../../../api/part/externalPartManufacturer'
import {selectLabelFormatUserDefaultListByUserId} from '../../../api/label/labelFormatUserDefault'
import {
getLabelFormatUserDefaultList,
selectLabelFormatUserDefaultListByUserId
} from '../../../api/label/labelFormatUserDefault'
import LinkedFormat from './format/linkedFormat.vue'
import {Decimal} from 'decimal.js'
import {savePrintLabelRecord} from '../../../api/label/printLabelRecord'
@ -554,6 +557,8 @@ export default {
},
logisticVisible:false,
templateList:[],
printTest:false,
}
},
watch:{
@ -582,6 +587,16 @@ export default {
"printCurrentPart.qtyPerCarton"(newVal,oldVal){
this.printCurrentPart.totalShipQty = this.totalShipQty();
},
printVisible(newVal,oldVal){
if (newVal === false){
this.printTest = false;
}
},
logisticVisible(newVal,oldVal){
if (newVal === false){
this.printTest = false;
}
}
},
methods:{
rowStyle({row}){
@ -798,73 +813,121 @@ export default {
savePrintLabelRecord(){
let params = {
...this.printCurrentPart,
createBy: this.$store.state.user.name,
createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
createBy: this.$store.state.user.name
}
this.printLoading = true;
savePrintLabelRecord(params).then(({data})=>{
if (data && data.code === 0) {
let notFound = [];
//
let labelList = this.labelFormatList.filter((item)=> item.labelType === 'Shipment Carton')
for (let label of labelList) {
let prints = data.rows.map((item) => {
let params = {
qrCode: `(00)${item.partNo}(01)${item.qtyPerCarton}(02)${item.umName}(03)${item.manufacturerDate}(04)${item.serialNumber? item.serialNumber : ''}(05)${item.manufacturerNo? item.manufacturerNo : ''}(06)${item.moldCode? item.moldCode : ''}(07)${item.boxNo? item.boxNo : ''}(08)(09)(10)`,
ref: item.partNo,
productRev: item.rev,
qty: item.qtyPerCarton,
uom: item.umName,
desc: item.partDesc,
rollCount: item.qtyPerRoll,
date: item.manufacturerDate,
manufacturer: item.manufacturerNo,
moldCode: item.moldCode,
sn: item.serialNumber,
freeInfo2: item.freeInfo2,
tradingMark: item.tradingMark,
weightUmName: item.weightUmName,
pictureMap:item.pictureMap,
printLabelType:item.printLabelType,
templateNo:item.templateNo,
dateStr:item.dateStr,
printStr1:item.printStr1,
printStr2:item.printStr2,
printStr3:item.printStr3,
}
if (item.packingWeight){
params.weight = new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber();
}
return params
});
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 labelList = data.rows
let icons = this.base64List.map((item)=>{return{icon: item,}})
for (let i = 0; i < labelList.length; i++) {
let item = labelList[i];
let params = {
qrCode: `(00)${item.partNo}(01)${item.qtyPerCarton}(02)${item.umName}(03)${item.manufacturerDate}(04)${item.serialNumber? item.serialNumber : ''}(05)${item.manufacturerNo? item.manufacturerNo : ''}(06)${item.moldCode? item.moldCode : ''}(07)${item.boxNo? item.boxNo : ''}(08)(09)(10)`,
ref: item.partNo,
productRev: item.rev,
qty: item.qtyPerCarton,
uom: item.umName,
desc: item.partDesc,
rollCount: item.qtyPerRoll,
date: item.manufacturerDate,
manufacturer: item.manufacturerNo,
moldCode: item.moldCode,
sn: item.serialNumber,
freeInfo2: item.freeInfo2,
tradingMark: item.tradingMark,
weightUmName: item.weightUmName,
pictureMap:item.pictureMap,
printLabelType:item.printLabelType,
templateNo:item.templateNo,
dateStr:item.dateStr,
printStr1:item.printStr1,
printStr2:item.printStr2,
printStr3:item.printStr3,
offsetX:item.offsetX,
offsetY:item.offsetY,
direction:item.direction,
}
let icons = this.base64List.map((item)=>{return{icon: item,}})
if (!this.printerSetupList.includes(label.defaultPrinterName)) {
notFound.push(label.defaultPrinterName)
continue
if (item.packingWeight){
params.weight = new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber();
}
if (label.printType === 'Alpha/Hard Tag'){
printAlphaHardTagLabel(prints,icons,label.defaultPrinterName)
}else if (label.printType === 'Hardware(Antenna)'){
let qrCodeList = this.$refs.qrCode.init([params.qrCode])
params.qrCode = qrCodeList[0]
if (item.printType === 'Alpha/Hard Tag'){
printAlphaHardTagLabel([params],icons,item.printerName,this.printTest)
}else if (item.printType === 'Hardware(Antenna)'){
if (this.printCurrentPart.category === 'Hardware(Antenna)-Serials'){
printAntennaLabel(prints,icons,label.defaultPrinterName,this.$store.state.user.autoSerialNumber)
printAntennaLabel([params],icons,item.printerName,this.$store.state.user.autoSerialNumber,this.printTest)
}else {
printAntennaLabel(prints,icons,label.defaultPrinterName)
printAntennaLabel([params],icons,item.printerName,'N',this.printTest)
}
}else if (label.printType === 'RF' || this.currentPart.category === 'RFID'){
printRF_RFIDLabel(prints,icons,label.defaultPrinterName)
}else if (item.printType === 'RF' || this.currentPart.category === 'RFID'){
printRF_RFIDLabel([params],icons,item.printerName,this.printTest)
}
this.printTest = false
}
if (notFound.length > 0){
this.$message.warning(`The printer ${notFound.join(',')} is not found`)
}else {
this.$message.success("Print label success")
}
// let notFound = [];
// //
// let labelList = this.labelFormatList.filter((item)=> item.labelType === 'Shipment Carton')
// for (let label of labelList) {
// let prints = data.rows.map((item) => {
// let params = {
// qrCode: `(00)${item.partNo}(01)${item.qtyPerCarton}(02)${item.umName}(03)${item.manufacturerDate}(04)${item.serialNumber? item.serialNumber : ''}(05)${item.manufacturerNo? item.manufacturerNo : ''}(06)${item.moldCode? item.moldCode : ''}(07)${item.boxNo? item.boxNo : ''}(08)(09)(10)`,
// ref: item.partNo,
// productRev: item.rev,
// qty: item.qtyPerCarton,
// uom: item.umName,
// desc: item.partDesc,
// rollCount: item.qtyPerRoll,
// date: item.manufacturerDate,
// manufacturer: item.manufacturerNo,
// moldCode: item.moldCode,
// sn: item.serialNumber,
// freeInfo2: item.freeInfo2,
// tradingMark: item.tradingMark,
// weightUmName: item.weightUmName,
// pictureMap:item.pictureMap,
// printLabelType:item.printLabelType,
// templateNo:item.templateNo,
// dateStr:item.dateStr,
// printStr1:item.printStr1,
// printStr2:item.printStr2,
// printStr3:item.printStr3,
// }
// if (item.packingWeight){
// params.weight = new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber();
// }
// return params
// });
// 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 icons = this.base64List.map((item)=>{return{icon: item,}})
// if (!this.printerSetupList.includes(label.defaultPrinterName)) {
// notFound.push(label.defaultPrinterName)
// continue
// }
// if (label.printType === 'Alpha/Hard Tag'){
// printAlphaHardTagLabel(prints,icons,label.defaultPrinterName)
// }else if (label.printType === 'Hardware(Antenna)'){
// if (this.printCurrentPart.category === 'Hardware(Antenna)-Serials'){
// printAntennaLabel(prints,icons,label.defaultPrinterName,this.$store.state.user.autoSerialNumber)
// }else {
// printAntennaLabel(prints,icons,label.defaultPrinterName)
// }
// }else if (label.printType === 'RF' || this.currentPart.category === 'RFID'){
// printRF_RFIDLabel(prints,icons,label.defaultPrinterName)
// }
// }
// if (notFound.length > 0){
// this.$message.warning(`The printer ${notFound.join(',')} is not found`)
// }else {
// this.$message.success("Print label success")
// }
}else {
this.$message.warning(data.msg)
}
@ -894,11 +957,10 @@ export default {
let params = {
site:this.currentPart.site,
partNo:this.currentPart.partNo,
customerNo:this.currentPart.customerNo,
username:this.$store.state.user.name,
category:this.currentPart.category,
}
selectLabelFormatUserDefaultListByUserId(params).then(({data})=>{
getLabelFormatUserDefaultList(params).then(({data})=>{
if (data && data.code === 0){
this.labelFormatList = data.rows;
}else {
@ -1032,6 +1094,9 @@ export default {
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)=>{
@ -1046,8 +1111,9 @@ export default {
notFound.push(label.defaultPrinterName)
continue
}
print_roll_label(prints,label.defaultPrinterName)
print_roll_label(prints,label.defaultPrinterName,this.printTest)
}
this.printTest = false
if (notFound.length > 0){
this.$message.warning(`The printer ${notFound.join(',')} is not found`)
return
@ -1132,6 +1198,9 @@ export default {
qty:this.currentPartLogistic.unitQtyPerPallet,
umName:this.currentPartLogistic.umName,
invoiceNo:this.currentPartLogistic.invoiceNo,
offsetX:data.row.offsetX,
offsetY:data.row.offsetY,
direction:data.row.direction,
}
let qrCodeList = this.$refs.qrCode.init([row.qrCode])
row.qrCode = qrCodeList[0]
@ -1141,8 +1210,9 @@ export default {
notFound.push(label.defaultPrinterName)
continue
}
printLogisticLabel([row],label.defaultPrinterName)
printLogisticLabel([row],label.defaultPrinterName,this.printTest)
}
this.printTest = false
if (notFound.length > 0){
this.$message.warning(`The printer ${notFound.join(',')} is not found`)
return
@ -1157,6 +1227,14 @@ export default {
this.$message.error(error)
this.printLoading = false;
})
},
handlePrintTest(val){
this.printTest = true
if (val === 0){
this.handlePrintOrSave();
}else {
this.handlePrintLogistic();
}
}
},
mounted () {
@ -1389,6 +1467,7 @@ export default {
</el-row>
</el-form>
<div slot="footer" style="text-align: center; margin-top: 10px">
<el-button type="primary" :loading="printLoading" style="width: 80px" @click="handlePrintTest(0)">Print Test</el-button>
<el-button type="primary" :loading="printLoading" style="width: 60px" @click="handlePrintOrSave">Print</el-button>
<el-button style="width: 60px" @click="printVisible = false">Cancel</el-button>
</div>
@ -1430,6 +1509,7 @@ export default {
</el-row>
</el-form>
<div slot="footer" style="text-align: center; margin-top: 10px">
<el-button type="primary" :loading="printLoading" style="width: 80px" @click="handlePrintTest(1)">Print Test</el-button>
<el-button type="primary" :loading="printLoading" style="width: 60px" @click="handlePrintLogistic">Print</el-button>
<el-button style="width: 60px" @click="logisticVisible = false">Cancel</el-button>
</div>

17
src/views/modules/label/record.vue

@ -426,6 +426,9 @@ export default {
printStr1:item.printStr1,
printStr2:item.printStr2,
printStr3:item.printStr3,
offsetX:item.offsetX,
offsetY:item.offsetY,
direction:item.direction,
}
if (item.packingWeight){
params.weight = new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber();
@ -457,17 +460,18 @@ export default {
continue
}
if (str[1] === 'Alpha/Hard Tag'){
printAlphaHardTagLabel(dataList,base64List,str[0])
printAlphaHardTagLabel(dataList,base64List,str[0],this.printTest)
}else if (str[1] === 'Hardware(Antenna)'){
if (print.category === 'Alpha/Hard Tag-Serials'){
printAlphaHardTagLabel(dataList,base64List,str[0])
printAlphaHardTagLabel(dataList,base64List,str[0],this.printTest)
}else {
printAntennaLabel(dataList,base64List,str[0],this.$store.state.user.autoSerialNumber)
printAntennaLabel(dataList,base64List,str[0],this.$store.state.user.autoSerialNumber,this.printTest)
}
}else if (str[1] === 'RF' || str[1] === 'RFID'){
printRF_RFIDLabel(dataList,base64List,str[0])
printRF_RFIDLabel(dataList,base64List,str[0],this.printTest)
}
}
this.printTest = false;
}
this.$refs.table.clearSelection()
if (notFound.length > 0){
@ -525,6 +529,10 @@ export default {
}
}
},
handlePrintTest () {
this.printTest = true;
this.handlePrintLabel();
}
},
mounted () {
const lodop = getLodop()
@ -602,6 +610,7 @@ export default {
<el-form-item label=" ">
<el-button type="primary" style="width: 60px" @click="getPrintLabelRecordList">Query</el-button>
<el-button type="primary" style="width: 60px" @click="handlePrintLabel">Print</el-button>
<el-button type="primary" style="width: 80px" @click="handlePrintTest">Print Test</el-button>
</el-form-item>
</el-col>
</el-row>

12
src/views/modules/label/roll.vue

@ -288,6 +288,7 @@ export default {
columnWidth: 140
}
],
printTest:false,
}
},
watch:{
@ -380,6 +381,9 @@ export default {
serialNumberRequired: item.serialNumberRequired,
serialNumber: item.serialNumber,
rollLabelFlag: item.rollLabelFlag,//
offsetX:item.offsetX,
offsetY:item.offsetY,
direction:item.direction,
}
})
let qrCodeList = this.$refs.qrCode.init(arr.map((item)=>{
@ -388,9 +392,10 @@ export default {
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.printTest)
}
}
this.printTest = false
this.$refs.table.clearSelection()
this.$message.success(data.msg)
}else {
@ -500,6 +505,10 @@ export default {
}
}
},
handlePrintTest(){
this.printTest = true
this.handlePrintLabel();
}
},
mounted () {
const lodop = getLodop()
@ -577,6 +586,7 @@ export default {
<el-form-item label=" ">
<el-button type="primary" style="width: 60px" @click="getPrintLabelRecordList">Query</el-button>
<el-button type="primary" style="width: 60px" @click="handlePrintLabel">Print</el-button>
<el-button type="primary" style="width: 80px" @click="handlePrintTest">Print Test</el-button>
</el-form-item>
</el-col>
</el-row>

36
src/views/modules/label/userDefault.vue

@ -13,7 +13,10 @@ let labelFormat = {
formatDesc: '',
active: 'Y',
printerName: '',
printerIP: ''
printerIP: '',
offsetX: 0,
offsetY: 0,
direction: '',
}
export default {
name: 'userDefault',
@ -44,6 +47,9 @@ export default {
labelFormatRules:{
printerName:[ { required: true, message: 'Printer Name is required', trigger: ['blur','change']}],
printerIP:[{ required: true, message: 'Printer IP is required', trigger: ['blur','change'] }],
offsetX:[{ required: true, message: 'Offset X is required', trigger: ['blur','change'] }],
offsetY:[{ required: true, message: 'Offset Y is required', trigger: ['blur','change'] }],
direction:[{ required: true, message: 'Direction is required', trigger: ['blur','change'] }],
},
columnList:[
{
@ -332,7 +338,7 @@ export default {
<el-dialog v-drag title="User Default Printer" :close-on-click-modal="false" @close="closeSaveVisible" :visible.sync="saveVisible" width="400px">
<el-form :model="saveLabelFormat" :rules="labelFormatRules" ref="saveLabelFormatForm" label-position="top">
<el-row :gutter="20">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="Label Type">
<el-select v-model="saveLabelFormat.labelType" style="width: 100%;" disabled placeholder="">
@ -351,19 +357,31 @@ export default {
<el-input v-model="saveLabelFormat.formatDesc" readonly disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="Offset(X)" prop="offsetX" :show-message="false">
<el-input-number v-model="saveLabelFormat.offsetX" :controls="false" :step="0" :precision="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="Offset(Y)" prop="offsetY" :show-message="false">
<el-input-number v-model="saveLabelFormat.offsetY" :controls="false" :step="0" :precision="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="Direction" prop="direction" :show-message="false">
<el-select v-model="saveLabelFormat.direction" placeholder=" " style="width: 100%;">
<el-option label="Horizontal" value="Horizontal"></el-option>
<el-option label="Vertical" value="Vertical"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="Printer Name" prop="printerName" :show-message="false">
<!-- <el-input v-model="saveLabelFormat.printerName"></el-input>-->
<el-select v-model="saveLabelFormat.printerName" placeholder=" " style="width: 100%;">
<el-option :label="item" :value="item" v-for="(item,index) in printerSetupList" :key="index"></el-option>
<el-option :label="item" :value="item" v-for="(item,index) in printerSetupList" :key="item"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="24">-->
<!-- <el-form-item label="Printer IP" prop="printerIP" :show-message="false">-->
<!-- <el-input v-model="saveLabelFormat.printerIP"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

4
src/views/modules/part/external.vue

@ -43,7 +43,7 @@ let part = {
printStr1: '',
printStr2: '',
printStr3: '',
rollLabelFlag: 'N',
rollLabelFlag: 'Y',
}
export default {
name: 'ExternalPart',
@ -1690,7 +1690,7 @@ export default {
</el-col>
<el-col :span="3">
<el-form-item label=" " :show-message="false">
<el-checkbox v-model="savePart.rollLabelFlag" true-label="Y" false-label="N">40*20 Label</el-checkbox>
<el-checkbox v-model="savePart.rollLabelFlag" true-label="Y" false-label="N">45*20 Label</el-checkbox>
</el-form-item>
</el-col>
</el-row>

Loading…
Cancel
Save