|
@@ -184,7 +184,11 @@ export const pdfPrint = function (data,index){
|
|
}
|
|
}
|
|
};
|
|
};
|
|
// 指定打印机
|
|
// 指定打印机
|
|
- LODOP.SET_PRINTER_INDEX(store.state.app.defaultPrint)
|
|
|
|
|
|
+ const isDefault = store.state.app.printUseDefault
|
|
|
|
+ // 手动选择,否则使用默认
|
|
|
|
+ if(isDefault=='0'){
|
|
|
|
+ LODOP.SET_PRINTER_INDEX(store.state.app.defaultPrint)
|
|
|
|
+ }
|
|
LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data[index])
|
|
LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data[index])
|
|
LODOP.SET_PRINT_PAGESIZE(3, 2090, (index==dlen-1)?50:0, '')
|
|
LODOP.SET_PRINT_PAGESIZE(3, 2090, (index==dlen-1)?50:0, '')
|
|
LODOP.PRINT()
|
|
LODOP.PRINT()
|
|
@@ -258,15 +262,22 @@ export const jGPrint = function (data, type, printerType, taskName) {
|
|
}
|
|
}
|
|
// pdf 打印预览
|
|
// pdf 打印预览
|
|
if (type == 'preview') {
|
|
if (type == 'preview') {
|
|
|
|
+ console.log('1-1-1')
|
|
store.commit('SET_pdfPrintList', data.data)
|
|
store.commit('SET_pdfPrintList', data.data)
|
|
store.commit('SET_showPdfPrint', data.data)
|
|
store.commit('SET_showPdfPrint', data.data)
|
|
store.commit('SET_printTaskName', taskName)
|
|
store.commit('SET_printTaskName', taskName)
|
|
} else if (type == 'print') { // pdf 打印
|
|
} else if (type == 'print') { // pdf 打印
|
|
hasExitTaskByName(function(){
|
|
hasExitTaskByName(function(){
|
|
// 选择打印机
|
|
// 选择打印机
|
|
- store.commit('SET_pdfPrintList', data.data)
|
|
|
|
- store.commit('SET_showSelectPrint', true)
|
|
|
|
- store.commit('SET_printTaskName', taskName)
|
|
|
|
|
|
+ const isDefault = store.state.app.printUseDefault
|
|
|
|
+ if(isDefault == '0'){
|
|
|
|
+ console.log('2-2-2')
|
|
|
|
+ store.commit('SET_pdfPrintList', data.data)
|
|
|
|
+ store.commit('SET_showSelectPrint', true)
|
|
|
|
+ store.commit('SET_printTaskName', taskName)
|
|
|
|
+ }else{
|
|
|
|
+ pdfPrint(data.data, 0)
|
|
|
|
+ }
|
|
})
|
|
})
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|