purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据打印的功能

Browse Source
This commit is contained in:
jishenghua
2025-05-25 00:04:58 +08:00
parent 2b7c43c3e1
commit 6063eaa52d
16 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -14,8 +14,8 @@
<!--打印-->
<a-button key="back" @click="handleCancel">取消(ESC)</a-button>
<template v-if="isShowPrintBtn">
<a-button v-if="billPrintFlag" @click="handlePrintPro">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
<a-button v-if="billPrintFlag" @click="handlePrintPro">三联打印-新版</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint">三联打印</a-button>
<!--此处为解决缓存问题-->
<a-button v-if="billType === '零售出库'" v-print="'#retailOutPrint'">普通打印</a-button>
<a-button v-if="billType === '零售退货入库'" v-print="'#retailBackPrint'">普通打印</a-button>
@@ -1952,25 +1952,25 @@
return ''
}
},
//三联打印新版预览
//三联打印新版
handlePrintPro() {
getPlatformConfigByKey({"platformKey": "bill_print_pro_url"}).then((res)=> {
if (res && res.code === 200) {
let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = document.documentElement.clientHeight - 260
this.$refs.modalProDetail.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalProDetail.title = this.billType + "-三联打印新版预览"
this.$refs.modalProDetail.title = this.billType + "-三联打印-新版"
}
})
},
//三联打印预览
//三联打印
handlePrint() {
getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> {
if (res && res.code === 200) {
let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = this.dataSource.length*50 + 600
this.$refs.modalDetail.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalDetail.title = this.billType + "-三联打印预览"
this.$refs.modalDetail.title = this.billType + "-三联打印"
}
})
},

12
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View File

@@ -1072,30 +1072,30 @@ export const BillModalMixin = {
this.$message.warning('请先保存单据后再提交流程！');
}
},
//三联打印新版预览
//三联打印新版
handlePrintPro(billType) {
if(this.model.id) {
getPlatformConfigByKey({"platformKey": "bill_print_pro_url"}).then((res)=> {
if (res && res.code === 200) {
let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = document.documentElement.clientHeight - 260
this.$refs.modalPrintPro.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalPrintPro.title = billType + "-三联打印新版预览"
this.$refs.modalPrintPro.title = billType + "-三联打印-新版"
}
})
} else {
this.$message.warning('请先保存单据后再打印！');
}
},
//三联打印预览
//三联打印
handlePrint(billType) {
if(this.model.id) {
getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> {
if (res && res.code === 200) {
let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = this.materialTable.dataSource.length*50 + 600
this.$refs.modalPrint.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalPrint.title = billType + "-三联打印预览"
this.$refs.modalPrint.title = billType + "-三联打印"
}
})
} else {

4
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('调拨出库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('调拨出库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('调拨出库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('调拨出库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('组装单')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('组装单')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('组装单')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('组装单')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('拆卸单')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('拆卸单')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('拆卸单')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('拆卸单')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('其它入库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('其它入库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('其它入库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('其它入库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('其它出库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('其它出库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('其它出库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('其它出库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
View File

@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('请购单')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('请购单')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('请购单')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('请购单')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('采购退货出库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('采购退货出库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('采购退货出库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('采购退货出库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('采购入库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('采购入库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('采购入库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('采购入库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('采购订单')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('采购订单')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('采购订单')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('采购订单')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('零售退货入库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('零售退货入库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('零售退货入库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('零售退货入库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('零售出库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('零售出库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('零售出库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('零售出库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('销售退货入库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('销售退货入库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('销售退货入库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('销售退货入库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('销售订单')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('销售订单')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('销售订单')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('销售订单')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->

4
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('销售出库')">三联打印新版预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('销售出库')">三联打印预览</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrintPro('销售出库')">三联打印-新版</a-button>
<a-button v-if="billPrintFlag && isShowPrintBtn" @click="handlePrint('销售出库')">三联打印</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
<!--发起多级审核-->