From 6e69c7828f74181b914a7323fe8851721a76e17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 4 May 2023 23:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E5=A4=9A=E7=BA=A7=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bill/dialog/BillDetail.vue | 15 -------------- .../src/views/bill/mixins/BillModalMixin.js | 16 ++++++++++++++- .../views/bill/modules/AllocationOutModal.vue | 5 +++++ .../src/views/bill/modules/AssembleModal.vue | 5 +++++ .../views/bill/modules/DisassembleModal.vue | 5 +++++ .../src/views/bill/modules/OtherInModal.vue | 5 +++++ .../src/views/bill/modules/OtherOutModal.vue | 5 +++++ .../views/bill/modules/PurchaseBackModal.vue | 5 +++++ .../views/bill/modules/PurchaseInModal.vue | 5 +++++ .../views/bill/modules/PurchaseOrderModal.vue | 5 +++++ .../views/bill/modules/RetailBackModal.vue | 5 +++++ .../src/views/bill/modules/RetailOutModal.vue | 5 +++++ .../src/views/bill/modules/SaleBackModal.vue | 5 +++++ .../src/views/bill/modules/SaleOrderModal.vue | 5 +++++ .../src/views/bill/modules/SaleOutModal.vue | 5 +++++ .../financial/dialog/FinancialDetail.vue | 20 +++---------------- .../financial/mixins/FinancialModalMixin.js | 19 +++++++++++++++--- .../financial/modules/AdvanceInModal.vue | 5 +++++ .../src/views/financial/modules/GiroModal.vue | 5 +++++ .../views/financial/modules/ItemInModal.vue | 5 +++++ .../views/financial/modules/ItemOutModal.vue | 5 +++++ .../views/financial/modules/MoneyInModal.vue | 5 +++++ .../views/financial/modules/MoneyOutModal.vue | 5 +++++ 23 files changed, 129 insertions(+), 36 deletions(-) diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 51bfb727..fe21a793 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -38,8 +38,6 @@ 反审核 取消 - - 提交流程 @@ -1003,7 +1001,6 @@ - @@ -1014,7 +1011,6 @@ import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api' import { getMpListShort, getCheckFlag, openDownloadDialog, sheet2blob } from "@/utils/util" import BillPrintIframe from './BillPrintIframe' - import WorkflowIframe from '@/components/tools/WorkflowIframe' import FinancialDetail from '../../financial/dialog/FinancialDetail' import JUpload from '@/components/jeecg/JUpload' import Vue from 'vue' @@ -1022,7 +1018,6 @@ name: 'BillDetail', components: { BillPrintIframe, - WorkflowIframe, FinancialDetail, JUpload }, @@ -1596,16 +1591,6 @@ } }) }, - //发起流程 - handleWorkflow() { - getPlatformConfigByKey({"platformKey": "send_workflow_url"}).then((res)=> { - if (res && res.code === 200) { - let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.number + '&type=1' - this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 320) - this.$refs.modalWorkflow.title = "发起流程" - } - }) - }, //零售出库|零售退货入库 retailExportExcel() { let aoa = [] diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 2c42a5d9..ccf0caa7 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -1,6 +1,6 @@ import { FormTypes, getListData } from '@/utils/JEditableTableUtil' import {findBySelectSup,findBySelectCus,findBySelectRetail,getMaterialByBarCode,findStockByDepotAndBarCode,getAccount, - getPersonByNumType, getBatchNumberList, getCurrentSystemConfig} from '@/api/api' + getPersonByNumType, getBatchNumberList, getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api' import { getAction,putAction } from '@/api/manage' import { getMpListShort, getNowFormatDateTime, getCheckFlag } from "@/utils/util" import { USER_INFO } from "@/store/mutation-types" @@ -812,5 +812,19 @@ export const BillModalMixin = { this.billStatus = '1' this.handleOk() }, + //发起流程 + handleWorkflow() { + if(this.model && this.model.number) { + getPlatformConfigByKey({ "platformKey": "send_workflow_url" }).then((res) => { + if (res && res.code === 200) { + let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.number + '&type=1' + this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 320) + this.$refs.modalWorkflow.title = "发起流程" + } + }) + } else { + this.$message.warning('请先保存单据后再提交流程!'); + } + } } } \ No newline at end of file diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 32ef6df0..b6d8711b 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -13,6 +13,8 @@ 取消 保存并审核 保存 + + 提交流程 @@ -87,12 +89,14 @@ +