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-13 22:56:14 +08:00
parent 3517f65a3e
commit 01fbf44c97
15 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1054,6 +1054,21 @@ 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 billPrintHeight = document.documentElement.clientHeight - 260
this.$refs.modalPrintPro.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalPrintPro.title = billType + "-三联打印新版预览"
}
})
} else {
this.$message.warning('请先保存单据后再打印！');
}
},
//三联打印预览
handlePrint(billType) {
if(this.model.id) {

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -92,6 +93,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -100,6 +102,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -115,6 +118,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate
},

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -91,6 +92,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -99,6 +101,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -115,6 +118,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate
},

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -91,6 +92,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -99,6 +101,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -115,6 +118,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate
},

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -117,6 +118,7 @@
<wait-bill-list ref="waitBillList" @ok="waitBillListOk"></wait-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -127,6 +129,7 @@
import ImportItemModal from '../dialog/ImportItemModal'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -146,6 +149,7 @@
WaitBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -117,6 +118,7 @@
<wait-bill-list ref="waitBillList" @ok="waitBillListOk"></wait-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -127,6 +129,7 @@
import ImportItemModal from '../dialog/ImportItemModal'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -146,6 +149,7 @@
WaitBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -15,6 +15,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -96,6 +97,7 @@
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -104,6 +106,7 @@
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -119,6 +122,7 @@
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -171,6 +172,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -183,6 +185,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -203,6 +206,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -15,6 +15,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -196,6 +197,7 @@
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
@@ -211,6 +213,7 @@
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -233,6 +236,7 @@
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -15,6 +15,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -181,6 +182,7 @@
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -193,6 +195,7 @@
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -213,6 +216,7 @@
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -160,6 +161,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -171,6 +173,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -191,6 +194,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -15,6 +15,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -171,6 +172,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -181,6 +183,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -200,6 +203,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
VNodes: {

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

@@ -14,6 +14,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -174,6 +175,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -186,6 +188,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -207,6 +210,7 @@
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
JSelectMultiple,

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

@@ -15,6 +15,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -172,6 +173,7 @@
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -183,6 +185,7 @@
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -202,6 +205,7 @@
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
JSelectMultiple,

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

@@ -15,6 +15,7 @@
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="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存（Ctrl+S）</a-button>
@@ -211,6 +212,7 @@
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
<bill-print-pro-iframe ref="modalPrintPro"></bill-print-pro-iframe>
</j-modal>
</template>
<script>
@@ -225,6 +227,7 @@
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import BillPrintProIframe from '../dialog/BillPrintProIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -247,6 +250,7 @@
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
BillPrintProIframe,
JUpload,
JDate,
JSelectMultiple,