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 @@
+