|
@@ -149,7 +149,7 @@ export default {
|
|
const h = html[i].clientHeight
|
|
const h = html[i].clientHeight
|
|
printCons.push({
|
|
printCons.push({
|
|
h: h<=pageHeight?pageHeight:h,
|
|
h: h<=pageHeight?pageHeight:h,
|
|
- t: '<div style="height:'+(h<=pageHeight?(pageHeight+'px'):'auto')+';">'+html[i].innerHTML+'</div>'
|
|
|
|
|
|
+ t: '<div style="height:'+(h<=pageHeight?(pageHeight+'px'):'auto')+';border:1px solid #fff;">'+html[i].innerHTML+'</div>'
|
|
})
|
|
})
|
|
}
|
|
}
|
|
// 排序从小到大
|
|
// 排序从小到大
|
|
@@ -162,7 +162,7 @@ export default {
|
|
this.$store.state.app.curActionPermission = 'B_eRPrint'
|
|
this.$store.state.app.curActionPermission = 'B_eRPrint'
|
|
// html, type, callback, printLogParams
|
|
// html, type, callback, printLogParams
|
|
// console.log(htmlStr)
|
|
// console.log(htmlStr)
|
|
- jGPlPrint(htmlStr.join('').split('&-NEWPAGE-&'), 'preview', function (res) {
|
|
|
|
|
|
+ jGPlPrint(htmlStr.join('').split('&-NEWPAGE-&'), 'print', function (res) {
|
|
_this.$store.state.app.curActionPermission = ''
|
|
_this.$store.state.app.curActionPermission = ''
|
|
_this.$emit('printOk', res)
|
|
_this.$emit('printOk', res)
|
|
},null,'费用报销单')
|
|
},null,'费用报销单')
|