diff --git a/src/api/customer/info.js b/src/api/customer/info.js index a65b210..37424ee 100644 --- a/src/api/customer/info.js +++ b/src/api/customer/info.js @@ -1,6 +1,7 @@ import {createAPI} from '../../utils/httpRequest' export const selectCustomerList = (data) => createAPI('/customer/list', 'post', data) +export const selectCustomerPage = (data) => createAPI(`/customer/${data.no}/${data.size}`, 'post', data) export const generateCustomerNo = (data) => createAPI('/customer/id', 'post', data) export const saveCustomer = (data) => createAPI('/customer/save', 'post', data) diff --git a/src/api/part/external.js b/src/api/part/external.js index 77a28ff..6b59f44 100644 --- a/src/api/part/external.js +++ b/src/api/part/external.js @@ -1,6 +1,7 @@ import {createAPI} from '../../utils/httpRequest' export const selectExternalPartList = (data) => createAPI('/part/list', 'post', data) +export const selectExternalPartPage = (data) => createAPI(`/part/${data.no}/${data.size}`, 'post', data) export const selectUnitList = (data) => createAPI('/part/unit/list', 'post', data) export const saveExternalPart = (data) => createAPI('/part/save', 'post', data) diff --git a/src/api/part/externalPartCustomer.js b/src/api/part/externalPartCustomer.js index 917a11a..0e3d95e 100644 --- a/src/api/part/externalPartCustomer.js +++ b/src/api/part/externalPartCustomer.js @@ -1,6 +1,7 @@ import {createAPI} from '../../utils/httpRequest' export const getExternalPartCustomerList = (data)=>createAPI(`/part/customer/list`,'post',data) +export const getExternalPartCustomerPage = (data)=>createAPI(`/part/customer/${data.no}/${data.size}`,'post',data) export const saveExternalPartCustomer = (data)=>createAPI(`/part/customer/save`,'post',data) diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js index b97381e..cdd2925 100644 --- a/src/printFormat/RF_RFID.js +++ b/src/printFormat/RF_RFID.js @@ -20,6 +20,7 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => { let row = printList[i] //如果打印正常的标签 LODOP.NewPage(); + LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); LODOP.ADD_PRINT_BARCODE(6,23,115,83,"QRCode",row.qrCode); LODOP.ADD_PRINT_IMAGE(4,249,96,18,""); diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js index 70f97aa..26e6e78 100644 --- a/src/printFormat/alphaHardTagPrintFormat.js +++ b/src/printFormat/alphaHardTagPrintFormat.js @@ -21,6 +21,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName) { let row = printList[i]; //如果打印正常的标签 LODOP.NewPage(); + LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); LODOP.ADD_PRINT_BARCODE(6,23,115,83,"QRCode",row.qrCode); LODOP.SET_PRINT_STYLEA(0,"FontSize",7); diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js index f67b3af..0e2c21b 100644 --- a/src/printFormat/antenna.js +++ b/src/printFormat/antenna.js @@ -20,6 +20,7 @@ export const printAntennaLabel = (printList, icons, printerName) => { let row = printList[i] //如果打印正常的标签 LODOP.NewPage() + LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '') LODOP.ADD_PRINT_BARCODE(6, 23, 115, 83, 'QRCode', row.qrCode) LODOP.ADD_PRINT_IMAGE(4, 249, 96, 18, '') diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js index d184b59..878f2f0 100644 --- a/src/printFormat/roll_label.js +++ b/src/printFormat/roll_label.js @@ -15,6 +15,7 @@ export const print_roll_label = (printList,printerName)=>{ for (let i = 0; i < printList.length; i++) { let row = printList[i]; LODOP.NewPage(); + LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0,450,250,""); LODOP.ADD_PRINT_IMAGE(0,4,"18mm","18mm",``); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); @@ -62,9 +63,9 @@ export const print_roll_label = (printList,printerName)=>{ LODOP.SET_PRINT_STYLEA(0,"Bold",1); if (row.rollLabelRequired === 'Y'){ - LODOP.ADD_PRINT_TEXT(58,73,30,20,"ROLL"); + LODOP.ADD_PRINT_TEXT(52,73,30,20,"ROLL"); }else if (row.serialNumberRequired === 'Y'){ - LODOP.ADD_PRINT_TEXT(58,73,50,20,"SERIAL"); + LODOP.ADD_PRINT_TEXT(52,73,50,20,"SERIAL"); } if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){ LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); @@ -83,17 +84,17 @@ export const print_roll_label = (printList,printerName)=>{ LODOP.SET_PRINT_STYLEA(0,"Bold",1); if (row.rollLabelRequired === 'Y'){ - LODOP.ADD_PRINT_TEXT(58,95,80,20,row.rollNo); + LODOP.ADD_PRINT_TEXT(52,95,80,20,row.rollNo); }else if (row.serialNumberRequired === 'Y'){ - LODOP.ADD_PRINT_TEXT(58,100,80,20,row.serialNumber); + LODOP.ADD_PRINT_TEXT(52,100,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(); - // LODOP.PRINT_DESIGN() + // LODOP.PRINT(); + LODOP.PRINT_DESIGN() } } diff --git a/src/views/modules/customer/info.vue b/src/views/modules/customer/info.vue index fb17c7b..b8fba8a 100644 --- a/src/views/modules/customer/info.vue +++ b/src/views/modules/customer/info.vue @@ -4,7 +4,7 @@ import { generateCustomerNo, removeCustomer, saveCustomer, - selectCustomerList, + selectCustomerList, selectCustomerPage, updateCustomer } from '../../../api/customer/info' import dayjs from 'dayjs' @@ -23,11 +23,14 @@ export default { }, height:{ type:Number, - default:760 + default:730 } }, data(){ return{ + no:1, + size:50, + total:0, customer:{ ...customer }, @@ -298,9 +301,39 @@ export default { } }) }, + handleSelectCustomerPage(){ + let params = { + ...this.customer, + site:this.$store.state.user.site, + no:this.no, + size:this.size + } + this.tableLoading = true; + selectCustomerPage(params).then(({data})=>{ + if (data && data.code === 0){ + this.customerList = data.rows; + this.total = data.total; + }else { + this.$message.warning(data.msg) + } + this.tableLoading = false; + }).catch((error)=>{ + this.$message.error(error) + this.tableLoading = false; + }) + }, + handleSizeChange(val){ + this.size = val; + this.handleSelectCustomerPage(); + }, + handleCurrentChange(val){ + this.no = val; + this.handleSelectCustomerPage(); + } }, created () { - this.handleSearch(); + this.handleSelectCustomerPage(); + // this.handleSearch(); this.getTableUserColumn("20002Table", 1) } } @@ -324,7 +357,8 @@ export default { New - Query + + Query - + + diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue index c7a396a..6ff557d 100644 --- a/src/views/modules/label/printer.vue +++ b/src/views/modules/label/printer.vue @@ -1,6 +1,6 @@