gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
季圣华 2023-05-04 23:08:54 +08:00
parent 923cc423de
commit 6e69c7828f
23 changed files with 129 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@ -38,8 +38,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">
<!--零售出库-->
@ -1003,7 +1001,6 @@
</template>
</a-form>
<bill-print-iframe ref="modalDetail"></bill-print-iframe>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
<financial-detail ref="financialDetailModal"></financial-detail>
</j-modal>
</template>
@ -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 = []

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

@ -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('请先保存单据后再提交流程！');
}
}
}
}

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

@ -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">
@ -87,12 +89,14 @@
</a-spin>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -106,6 +110,7 @@
components: {
DepotModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate
},

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

@ -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">
@ -86,12 +88,14 @@
</a-spin>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -106,6 +110,7 @@
components: {
DepotModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate
},

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

@ -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">
@ -86,12 +88,14 @@
</a-spin>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -106,6 +110,7 @@
components: {
DepotModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate
},

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

@ -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">
@ -103,6 +105,7 @@
<vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -110,6 +113,7 @@
import VendorModal from '../../system/modules/VendorModal'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -124,6 +128,7 @@
VendorModal,
DepotModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -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">
@ -103,6 +105,7 @@
<customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -110,6 +113,7 @@
import CustomerModal from '../../system/modules/CustomerModal'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -124,6 +128,7 @@
CustomerModal,
DepotModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -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">
@ -165,6 +167,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -175,6 +178,7 @@
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -193,6 +197,7 @@
DepotModal,
AccountModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -16,6 +16,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">
@ -188,6 +190,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
@ -200,6 +203,7 @@
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -219,6 +223,7 @@
AccountModal,
BatchSetDepot,
HistoryBillList,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -16,6 +16,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">
@ -163,6 +165,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -172,6 +175,7 @@
import VendorModal from '../../system/modules/VendorModal'
import AccountModal from '../../system/modules/AccountModal'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -189,6 +193,7 @@
VendorModal,
AccountModal,
HistoryBillList,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -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">
@ -154,6 +156,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -163,6 +166,7 @@
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -181,6 +185,7 @@
DepotModal,
AccountModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -16,6 +16,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">
@ -168,6 +170,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -176,6 +179,7 @@
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -193,6 +197,7 @@
DepotModal,
AccountModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate,
VNodes: {

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

@ -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">
@ -168,6 +170,7 @@
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -178,6 +181,7 @@
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -197,6 +201,7 @@
DepotModal,
AccountModal,
BatchSetDepot,
WorkflowIframe,
JUpload,
JDate,
JSelectMultiple,

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

@ -16,6 +16,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">
@ -162,6 +164,7 @@
<customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -170,6 +173,7 @@
import CustomerModal from '../../system/modules/CustomerModal'
import AccountModal from '../../system/modules/AccountModal'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -186,6 +190,7 @@
CustomerModal,
AccountModal,
HistoryBillList,
WorkflowIframe,
JUpload,
JDate,
JSelectMultiple,

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

@ -16,6 +16,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">
@ -203,6 +205,7 @@
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
</j-modal>
</template>
<script>
@ -214,6 +217,7 @@
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import HistoryBillList from '../dialog/HistoryBillList'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@ -234,6 +238,7 @@
AccountModal,
BatchSetDepot,
HistoryBillList,
WorkflowIframe,
JUpload,
JDate,
JSelectMultiple,

20
jshERP-web/src/views/financial/dialog/FinancialDetail.vue
View File

@ -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({

19
jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
View File

@ -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('请先保存单据后再提交流程！');
}
},
}
}

5
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View File

@ -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: {

5
jshERP-web/src/views/financial/modules/GiroModal.vue
View File

@ -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: {

5
jshERP-web/src/views/financial/modules/ItemInModal.vue
View File

@ -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: {

5
jshERP-web/src/views/financial/modules/ItemOutModal.vue
View File

@ -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: {

5
jshERP-web/src/views/financial/modules/MoneyInModal.vue
View File

@ -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: {

5
jshERP-web/src/views/financial/modules/MoneyOutModal.vue
View File

@ -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: {