把多级审核的提交流程按钮移到编辑界面

jshERP-web/src/views/financial/dialog/FinancialDetail.vue

@@ -20,8 +20,6 @@
       <!--反审核-->
       <a-button v-if="checkFlag && isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
       <a-button key="back" @click="handleCancel">取消</a-button>
-      <!--发起多级审核-->
-      <a-button v-if="!checkFlag && model.status==='0'" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-form :form="form">
       <!--收预付款-->
@@ -396,20 +394,18 @@
         </a-row>
       </template>
     </a-form>
-    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import { getAction, postAction } from '@/api/manage'
-  import { findFinancialDetailByNumber, getCurrentSystemConfig, getPlatformConfigByKey } from '@/api/api'
-  import { getCheckFlag } from "@/utils/util"
-  import WorkflowIframe from '@/components/tools/WorkflowIframe'
+  import { findFinancialDetailByNumber, getCurrentSystemConfig } from '@/api/api'
+  import { getCheckFlag } from '@/utils/util'
   import JUpload from '@/components/jeecg/JUpload'
+
   export default {
     name: 'FinancialDetail',
     components: {
-      WorkflowIframe,
       JUpload
     },
     data () {
@@ -528,16 +524,6 @@
           }
         })
       },
-      //发起流程
-      handleWorkflow() {
-        getPlatformConfigByKey({"platformKey": "send_workflow_url"}).then((res)=> {
-          if (res && res.code === 200) {
-            let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.billNo + '&type=2'
-            this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 320)
-            this.$refs.modalWorkflow.title = "发起流程"
-          }
-        })
-      },
       handleBackCheck() {
         let that = this
         this.$confirm({

jshERP-web/src/views/financial/mixins/FinancialModalMixin.js

@@ -1,7 +1,6 @@
-import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
-import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount,
+import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,getPlatformConfigByKey,getAccount,
   getPersonByType,findInOutItemByParam,getCurrentSystemConfig} from '@/api/api'
-import { getAction,putAction } from '@/api/manage'
+import { getAction } from '@/api/manage'
 import { getCheckFlag, getNowFormatDateTime } from "@/utils/util"
 import { USER_INFO } from "@/store/mutation-types"
 import Vue from 'vue'
@@ -303,5 +302,19 @@ export const FinancialModalMixin = {
       this.billStatus = '1'
       this.handleOk()
     },
+    //发起流程
+    handleWorkflow() {
+      if(this.model && this.model.billNo) {
+        getPlatformConfigByKey({ "platformKey": "send_workflow_url" }).then((res) => {
+          if (res && res.code === 200) {
+            let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.billNo + '&type=2'
+            this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 320)
+            this.$refs.modalWorkflow.title = "发起流程"
+          }
+        })
+      } else {
+        this.$message.warning('请先保存单据后再提交流程！');
+      }
+    },
   }
 }

jshERP-web/src/views/financial/modules/AdvanceInModal.vue

@@ -13,6 +13,8 @@
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
       <a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
+      <!--发起多级审核-->
+      <a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -98,11 +100,13 @@
       </a-form>
     </a-spin>
     <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
+    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import PersonModal from '../../system/modules/PersonModal'
+  import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -113,6 +117,7 @@
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
       PersonModal,
+      WorkflowIframe,
       JUpload,
       JDate,
       VNodes: {

jshERP-web/src/views/financial/modules/GiroModal.vue

@@ -13,6 +13,8 @@
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
       <a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
+      <!--发起多级审核-->
+      <a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -102,12 +104,14 @@
     </a-spin>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
+    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import AccountModal from '../../system/modules/AccountModal'
   import PersonModal from '../../system/modules/PersonModal'
+  import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -119,6 +123,7 @@
     components: {
       AccountModal,
       PersonModal,
+      WorkflowIframe,
       JUpload,
       JDate,
       VNodes: {

jshERP-web/src/views/financial/modules/ItemInModal.vue

@@ -13,6 +13,8 @@
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
       <a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
+      <!--发起多级审核-->
+      <a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -110,12 +112,14 @@
     </a-spin>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
+    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import AccountModal from '../../system/modules/AccountModal'
   import PersonModal from '../../system/modules/PersonModal'
+  import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -127,6 +131,7 @@
     components: {
       AccountModal,
       PersonModal,
+      WorkflowIframe,
       JUpload,
       JDate,
       VNodes: {

jshERP-web/src/views/financial/modules/ItemOutModal.vue

@@ -13,6 +13,8 @@
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
       <a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
+      <!--发起多级审核-->
+      <a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -110,12 +112,14 @@
     </a-spin>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
+    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import AccountModal from '../../system/modules/AccountModal'
   import PersonModal from '../../system/modules/PersonModal'
+  import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -127,6 +131,7 @@
     components: {
       AccountModal,
       PersonModal,
+      WorkflowIframe,
       JUpload,
       JDate,
       VNodes: {

jshERP-web/src/views/financial/modules/MoneyInModal.vue

@@ -13,6 +13,8 @@
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
       <a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
+      <!--发起多级审核-->
+      <a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -140,6 +142,7 @@
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
+    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
@@ -148,6 +151,7 @@
   import CustomerModal from '../../system/modules/CustomerModal'
   import AccountModal from '../../system/modules/AccountModal'
   import PersonModal from '../../system/modules/PersonModal'
+  import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -161,6 +165,7 @@
       CustomerModal,
       AccountModal,
       PersonModal,
+      WorkflowIframe,
       JUpload,
       JDate,
       VNodes: {

jshERP-web/src/views/financial/modules/MoneyOutModal.vue

@@ -13,6 +13,8 @@
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
       <a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
+      <!--发起多级审核-->
+      <a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -140,6 +142,7 @@
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <person-modal ref="personModalForm" @ok="personModalFormOk"></person-modal>
+    <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
@@ -148,6 +151,7 @@
   import VendorModal from '../../system/modules/VendorModal'
   import AccountModal from '../../system/modules/AccountModal'
   import PersonModal from '../../system/modules/PersonModal'
+  import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
@@ -161,6 +165,7 @@
       VendorModal,
       AccountModal,
       PersonModal,
+      WorkflowIframe,
       JUpload,
       JDate,
       VNodes: {