aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-02 19:39:24 +08:00
parent f7c3e5223a
commit b2fd5a9a9a
6 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.production
View File

@ -10,7 +10,6 @@ VUE_APP_VERSION = '20240520'
VUE_APP_PDOMAIN = 'tanex56'
VUE_APP_DATA_FROM = 'pc'
VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
VUE_APP_WS_HOST = 'wss://api.emis.tanex56.com/api/bizsvr'
VUE_APP_PRINTER_HOST = '127.0.0.1:17080'

BIN
public/static/tpl/batch_import_order.xls
View File

Binary file not shown.

9
src/components/XdTable/index.vue
View File

@ -545,7 +545,7 @@ export default {
key: ''
},
tableData:[],
dropCol:[],
isDragging: false,
startRowIndex: -1,
@ -838,14 +838,13 @@ export default {
getTablePosition() {
return this.tableDom.getBoundingClientRect();
},
/**
* 列拖拽
*/
// 列拖拽
columnDrop() {
const _this = this;
var xdTableObj = document.getElementById(this.tableId);
// var tbHeader1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0];
const wrapperTr = xdTableObj.querySelector('.el-table__header-wrapper tr');
console.log("===>columnDrop==>",wrapperTr)
this.sortable = Sortable.create(wrapperTr, {
animation: 180,
delay: 0,
@ -856,7 +855,7 @@ export default {
this.newCol=evt.newIndex-1
_this.dropCol.splice(evt.oldIndex- empty, 1);
_this.dropCol.splice(evt.newIndex- empty, 0, oldItem);
console.log(_this.dropCol)
console.log("===>columnDrop==>",_this.dropCol)
}
});
},

64
src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
View File

@ -116,6 +116,8 @@
subBillEnd:null,
openPdfView:false,
orderDetailMap:new Map(),
isInitA4:false,
printManCode:this.$store.getters.empCode,
@ -259,7 +261,7 @@
this.tanexPrinter.batchPrintAdv(printDataList,this.printManCode);
},
batchPrint(orderList,tplCode){
batchPrint(orderList,tplCode,orderDetailList){
if(this.printerStatus !=1){
this.$modal.msgError("打印机未连接");
@ -267,6 +269,13 @@
}
this.isInitA4=false;
this.orderDetailMap=new Map();
if(orderDetailList){
orderDetailList.map(v=>{
this.orderDetailMap[v.billCode]=v;
});
}
let that = this;
let newOrderList=[];
if(orderList){
@ -286,13 +295,16 @@
subBillStart=this.subBillStart;
}
let subBillEnd=50;
if(this.subBillEnd){
subBillEnd = this.subBillEnd;
let billDetail = this.orderDetailMap[billCode];
let subBillEnd=parseInt(billDetail.parcelQty);
if(this.subBillEnd&&this.subBillEnd!=''){
subBillEnd = parseInt(this.subBillEnd)<=parseInt(billDetail.parcelQty)?parseInt(this.subBillEnd):parseInt(billDetail.parcelQty);
}
// 循环子单范围
for(let i=subBillStart;i<=subBillEnd;i++){
let subBillCode = billCode+""+this.lpadZero(i,4);
let subBillCode = billCode+""+this.lpadZero(i,4);
newOrderList.push(subBillCode);
}
@ -301,8 +313,8 @@
newOrderList=[...orderList];
}
console.log("tnprint===>",newOrderList);
console.log("tnprint===>",that.selTplCode);
// console.log("tnprint===>",newOrderList);
// console.log("tnprint===>",that.selTplCode);
that.tanexPrinter.batchPrint(that.selTplCode,that.selPrinterName,newOrderList,this.printManCode)
},
@ -356,13 +368,23 @@
});
},
printPreview(orderList,isA4,tplCode){
printPreview(orderList,isA4,tplCode,orderDetailList){
this.refreshKey();
if(this.printerStatus !=1){
this.$modal.msgError("打印机未连接");
return;
}
this.orderDetailMap=new Map();
if(orderDetailList){
orderDetailList.map(v=>{
this.orderDetailMap[v.billCode]=v;
});
}
// console.log("====>orderDetailMap==>",this.orderDetailMap);
if(tplCode){
this.selTplCode=tplCode;
}
@ -377,6 +399,8 @@
this.orderList=[...orderList]
}
// 打印子单
if(this.selTplCode=="TAN-GC-130"){
for(let i=0;i<this.orderList.length;i++){
@ -386,10 +410,14 @@
subBillStart=this.subBillStart;
}
let subBillEnd=50;
let billDetail = this.orderDetailMap[billCode];
// console.log("====>billDetail==>",billDetail);
let subBillEnd=parseInt(billDetail.parcelQty);
if(this.subBillEnd){
subBillEnd = this.subBillEnd;
subBillEnd = parseInt(this.subBillEnd)<=parseInt(billDetail.parcelQty)?parseInt(this.subBillEnd):parseInt(billDetail.parcelQty);
}
// 循环子单范围
for(let i=subBillStart;i<=subBillEnd;i++){
let subBillCode = billCode+""+this.lpadZero(i,4);
@ -439,13 +467,20 @@
}
});
},
downPDF(orderList,isA4,tplCode){
downPDF(orderList,isA4,tplCode,orderDetailList){
if(this.printerStatus !=1){
this.$modal.msgError("打印机未连接");
return;
}
this.orderDetailMap=new Map();
if(orderDetailList){
orderDetailList.map(v=>{
this.orderDetailMap[v.billCode]=v;
});
}
if(tplCode){
this.selTplCode=tplCode;
}
@ -470,9 +505,12 @@
subBillStart=this.subBillStart;
}
let subBillEnd=50;
let billDetail = this.orderDetailMap[billCode];
// console.log("====>billDetail==>",billDetail);
let subBillEnd=parseInt(billDetail.parcelQty);
if(this.subBillEnd){
subBillEnd = this.subBillEnd;
subBillEnd = parseInt(this.subBillEnd)<=parseInt(billDetail.parcelQty)?parseInt(this.subBillEnd):parseInt(billDetail.parcelQty);
}
for(let i=subBillStart;i<=subBillEnd;i++){

2
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -300,6 +300,8 @@
:height="(slotProps.contentHeight)+'px'"
ref="refTable"
row-key="id"
storageName="sendWaybillList_main_240702"
v-loading="loading"
border

9
src/views/emis/emisWaybill/waybillIsPrinted.vue
View File

@ -461,8 +461,8 @@ export default {
orderList.push(item.billCode);
});
this.$refs.tanexPrinter.batchPrint(orderList,null,false);
// batchPrint(orderList,tplCode,orderDetailList)
this.$refs.tanexPrinter.batchPrint(orderList,null,this.currentSelection);
}).catch(() => {});
},
@ -471,14 +471,15 @@ export default {
this.currentSelection.forEach(item=>{
orderList.push(item.billCode);
});
this.$refs.tanexPrinter.printPreview(orderList,false);
// printPreview(orderList,isA4,tplCode,orderDetailList)
this.$refs.tanexPrinter.printPreview(orderList,false,null,this.currentSelection);
},
handleDownPDF(){
let orderList=[];
this.currentSelection.forEach(item=>{
orderList.push(item.billCode);
});
this.$refs.tanexPrinter.downPDF(orderList,false);
this.$refs.tanexPrinter.downPDF(orderList,false,null,this.currentSelection);
},
/** 查询运单列表列表 */
getList() {