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

给单据的编辑界面增加打印按钮

Browse Source
This commit is contained in:
jishenghua
2024-06-03 23:44:00 +08:00
parent b7a3ec35b8
commit 42d7b98607
15 changed files with 95 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ export const BillModalMixin = {
minWidth: 1100,
isCanCheck: true,
isTenant: false,
billPrintFlag: false,
/* 原始审核是否开启 */
checkFlag: true,
validatorRules:{
@@ -985,6 +986,29 @@ export const BillModalMixin = {
} 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 billPrintHeight = this.materialTable.dataSource.length*50 + 600
this.$refs.modalPrint.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalPrint.title = billType + "-三联打印预览"
}
})
} else {
this.$message.warning('请先保存单据后再打印！');
}
},
//加载平台配置信息
initPlatform() {
getPlatformConfigByKey({"platformKey": "bill_print_flag"}).then((res)=> {
if (res && res.code === 200) {
this.billPrintFlag = res.data.platformValue==='1'?true:false
}
})
}
}
}

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('调拨出库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -86,6 +87,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<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>
</j-modal>
</template>
<script>
@@ -93,6 +95,7 @@
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -107,6 +110,7 @@
DepotModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate
},
@@ -217,6 +221,7 @@
}
this.initSystemConfig()
this.initDepot()
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('组装单')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -85,6 +86,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<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>
</j-modal>
</template>
<script>
@@ -92,6 +94,7 @@
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -107,6 +110,7 @@
DepotModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate
},
@@ -215,6 +219,7 @@
}
this.initSystemConfig()
this.initDepot()
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('拆卸单')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -85,6 +86,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<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>
</j-modal>
</template>
<script>
@@ -92,6 +94,7 @@
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -107,6 +110,7 @@
DepotModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate
},
@@ -214,6 +218,7 @@
}
this.initSystemConfig()
this.initDepot()
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('其它入库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -111,6 +112,7 @@
<import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
<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>
</j-modal>
</template>
<script>
@@ -120,6 +122,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import ImportItemModal from '../dialog/ImportItemModal'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -138,6 +141,7 @@
ImportItemModal,
WaitBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -269,6 +273,7 @@
this.initSystemConfig()
this.initSupplier(0)
this.initDepot()
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('其它出库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -111,6 +112,7 @@
<import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
<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>
</j-modal>
</template>
<script>
@@ -120,6 +122,7 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import ImportItemModal from '../dialog/ImportItemModal'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -138,6 +141,7 @@
ImportItemModal,
WaitBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -269,6 +273,7 @@
this.initSystemConfig()
this.initCustomer(0)
this.initDepot()
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

5
jshERP-web/src/views/bill/modules/PurchaseApplyModal.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" @click="handlePrint('请购单')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -93,6 +94,7 @@
<import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
</j-modal>
</template>
<script>
@@ -100,6 +102,7 @@
import ImportItemModal from '../dialog/ImportItemModal'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -114,6 +117,7 @@
ImportItemModal,
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -236,6 +240,7 @@
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initPlatform()
},
/** 整理成formData */
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('采购退货出库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -164,6 +165,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<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>
</j-modal>
</template>
<script>
@@ -175,6 +177,7 @@
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -194,6 +197,7 @@
AccountModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -341,6 +345,7 @@
this.initSupplier(0)
this.initDepot()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

7
jshERP-web/src/views/bill/modules/PurchaseInModal.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" @click="handlePrint('采购入库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -191,6 +192,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
</j-modal>
</template>
@@ -205,14 +207,15 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort, changeListFmtMinus,handleIntroJs } from "@/utils/util"
import { getAction } from '@/api/manage'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "PurchaseInModal",
mixins: [JEditableTableMixin, BillModalMixin],
@@ -226,6 +229,7 @@
BatchSetDepot,
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -390,6 +394,7 @@
this.initSupplier(0)
this.initDepot()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

5
jshERP-web/src/views/bill/modules/PurchaseOrderModal.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" @click="handlePrint('采购订单')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -177,6 +178,7 @@
<link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
</j-modal>
</template>
<script>
@@ -188,6 +190,7 @@
import AccountModal from '../../system/modules/AccountModal'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -207,6 +210,7 @@
AccountModal,
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -348,6 +352,7 @@
this.initSystemConfig()
this.initSupplier(0)
this.initAccount(0)
this.initPlatform()
},
/** 整理成formData */
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('零售退货入库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -153,6 +154,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<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>
</j-modal>
</template>
<script>
@@ -163,6 +165,7 @@
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -182,6 +185,7 @@
AccountModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -323,6 +327,7 @@
this.initRetail(0)
this.initDepot()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

5
jshERP-web/src/views/bill/modules/RetailOutModal.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" @click="handlePrint('零售出库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -167,6 +168,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<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>
</j-modal>
</template>
<script>
@@ -176,6 +178,7 @@
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -194,6 +197,7 @@
AccountModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
VNodes: {
@@ -333,6 +337,7 @@
this.initRetail(0)
this.initDepot()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

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

@@ -11,6 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="billPrintFlag" @click="handlePrint('销售退货入库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -167,6 +168,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<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>
</j-modal>
</template>
<script>
@@ -178,6 +180,7 @@
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -198,6 +201,7 @@
AccountModal,
BatchSetDepot,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
JSelectMultiple,
@@ -349,6 +353,7 @@
this.initSalesman()
this.initDepot()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

5
jshERP-web/src/views/bill/modules/SaleOrderModal.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" @click="handlePrint('销售订单')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -169,6 +170,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
</j-modal>
</template>
<script>
@@ -179,6 +181,7 @@
import AccountModal from '../../system/modules/AccountModal'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -197,6 +200,7 @@
AccountModal,
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
JSelectMultiple,
@@ -324,6 +328,7 @@
this.initCustomer(0)
this.initSalesman()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {

6
jshERP-web/src/views/bill/modules/SaleOutModal.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" @click="handlePrint('销售出库')">三联打印预览</a-button>
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
<!--发起多级审核-->
@@ -206,6 +207,7 @@
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
<bill-print-iframe ref="modalPrint"></bill-print-iframe>
</j-modal>
</template>
<script>
@@ -219,11 +221,11 @@
import BatchSetDepot from '../dialog/BatchSetDepot'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import BillPrintIframe from '../dialog/BillPrintIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort,handleIntroJs } from "@/utils/util"
import { getAction } from '@/api/manage'
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate'
@@ -241,6 +243,7 @@
BatchSetDepot,
HistoryBillList,
WorkflowIframe,
BillPrintIframe,
JUpload,
JDate,
JSelectMultiple,
@@ -409,6 +412,7 @@
this.initSalesman()
this.initDepot()
this.initAccount(0)
this.initPlatform()
},
//提交单据时整理成formData
classifyIntoFormData(allValues) {