diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index c2827266..b6b08ee4 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -14,6 +14,7 @@ 取消(ESC) + @@ -1187,6 +1189,7 @@ import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api' import { getMpListShort, getCheckFlag, exportXlsPost } from "@/utils/util" import BillPrintIframe from './BillPrintIframe' + import BillPrintProIframe from './BillPrintProIframe' import FinancialDetail from '../../financial/dialog/FinancialDetail' import JUpload from '@/components/jeecg/JUpload' import Vue from 'vue' @@ -1194,6 +1197,7 @@ name: 'BillDetail', components: { BillPrintIframe, + BillPrintProIframe, FinancialDetail, JUpload }, @@ -1940,6 +1944,17 @@ 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 billPrintHeight = document.documentElement.clientHeight - 260 + this.$refs.modalProDetail.show(this.model, billPrintUrl, billPrintHeight) + this.$refs.modalProDetail.title = this.billType + "-三联打印新版预览" + } + }) + }, //三联打印预览 handlePrint() { getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> { diff --git a/jshERP-web/src/views/bill/dialog/BillPrintProIframe.vue b/jshERP-web/src/views/bill/dialog/BillPrintProIframe.vue new file mode 100644 index 00000000..863a3d80 --- /dev/null +++ b/jshERP-web/src/views/bill/dialog/BillPrintProIframe.vue @@ -0,0 +1,80 @@ + + + + + \ No newline at end of file