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

通过开关兼容多级审核功能

Browse Source
This commit is contained in:
季圣华 2023-02-23 01:21:11 +08:00
parent eb7fc23fa5
commit ac57394f60
47 changed files with 275 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
jshERP-web/src/components/tools/WorkflowIframe.vue Normal file
View File

@ -0,0 +1,83 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="width"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'93px','left':'154px'}"
:wrapClassName="wrapClassNameInfo()"
:mask="isDesktop()"
:maskClosable="false"
:style="modalStyle"
@cancel="handleCancel"
cancelText="关闭">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
<a-form :form="form">
<template>
<iframe :src="sendWorkflowUrl" width="100%" :height="height" frameborder="0" scrolling="no"></iframe>
</template>
<template>
<a-row>
<a-col>
<a-form-item>
<a-input v-decorator="['id']" hidden/>
</a-form-item>
</a-col>
</a-row>
</template>
</a-form>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'
import {mixinDevice} from '@/utils/mixin'
export default {
name: 'WorkflowIframe',
mixins: [mixinDevice],
data () {
return {
title: "发起流程",
width: '500px',
visible: false,
modalStyle: '',
sendWorkflowUrl: '',
height: "",
model: {},
form: this.$form.createForm(this),
loading: false
}
},
created () {
},
methods: {
show(record, sendWorkflowUrl, height) {
this.height = height
this.sendWorkflowUrl = sendWorkflowUrl
this.visible = true
this.modalStyle = 'top:20%; height: 50%;'
this.model = Object.assign({}, record)
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'id'))
});
},
handleCancel() {
this.close()
},
close() {
this.sendWorkflowUrl = ''
this.$emit('close')
this.visible = false
this.modalStyle = ''
}
}
}
</script>
<style scoped>
</style>

2
jshERP-web/src/mixins/JeecgListMixin.js
View File

@ -59,7 +59,7 @@ export const JeecgListMixin = {
/** 是否加载时就执行 */
disableMixinCreated: false,
/* 按钮权限 */
btnEnableList: ''
btnEnableList: '',
}
},
created() {

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

@ -81,8 +81,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -203,6 +203,7 @@
computed: {
},
created() {
this.initSystemConfig()
this.getDepotData()
this.initUser()
},

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

@ -81,8 +81,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -203,6 +203,7 @@
computed: {
},
created() {
this.initSystemConfig()
this.getDepotData()
this.initUser()
},

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

@ -81,8 +81,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -203,6 +203,7 @@
computed: {
},
created() {
this.initSystemConfig()
this.getDepotData()
this.initUser()
},

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

@ -95,8 +95,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -220,6 +220,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initSupplier()
this.getDepotData()
this.initUser()

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

@ -95,8 +95,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -220,6 +220,7 @@
computed: {
},
created() {
this.initSystemConfig()
this.initCustomer()
this.getDepotData()
this.initUser()

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

@ -104,8 +104,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -248,6 +248,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initSupplier()
this.getDepotData()
this.initUser()

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

@ -112,8 +112,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -271,6 +271,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initSupplier()
this.getDepotData()
this.initUser()

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

@ -83,8 +83,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -223,6 +223,7 @@
}
},
created() {
this.initSystemConfig()
this.initSupplier()
this.initUser()
},

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

@ -104,8 +104,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -245,6 +245,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initRetail()
this.getDepotData()
this.initUser()

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

@ -99,8 +99,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -239,6 +239,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initRetail()
this.getDepotData()
this.initUser()

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

@ -105,8 +105,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -248,6 +248,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initCustomer()
this.getDepotData()
this.initUser()

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

@ -84,8 +84,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -227,6 +227,7 @@
}
},
created() {
this.initSystemConfig()
this.initCustomer()
this.initUser()
this.getSystemConfig()

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

@ -113,8 +113,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -271,6 +271,7 @@
computed: {
},
created() {
this.initSystemConfig()
this.initCustomer()
this.getDepotData()
this.initUser()

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

@ -36,8 +36,10 @@
<a-button v-if="billType === '组装单'||billType === '拆卸单'" @click="assembleExportExcel()">导出</a-button>
<a-button v-if="billType === '盘点复盘'" @click="stockCheckReplayExportExcel()">导出</a-button>
<!--反审核-->
<a-button v-if="isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
<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">
<!--零售出库-->
@ -1001,6 +1003,7 @@
</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>
@ -1011,6 +1014,7 @@
import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
import { getMpListShort, 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'
@ -1018,6 +1022,7 @@
name: 'BillDetail',
components: {
BillPrintIframe,
WorkflowIframe,
FinancialDetail,
JUpload
},
@ -1035,6 +1040,8 @@
purchaseBySaleFlag: false,
linkNumberList: [],
financialBillNoList: [],
/* 原始审核是否开启 */
checkFlag: true,
tableWidth: {
'width': '1500px'
},
@ -1450,6 +1457,7 @@
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.purchaseBySaleFlag = res.data.purchaseBySaleFlag==='1'?true:false
this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
@ -1575,8 +1583,18 @@
if (res && res.code === 200) {
let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
let billPrintHeight = this.dataSource.length*50 + 600
this.$refs.modalDetail.show(this.model, billPrintUrl, billPrintHeight);
this.$refs.modalDetail.title = this.billType + "-三联打印预览";
this.$refs.modalDetail.show(this.model, billPrintUrl, billPrintHeight)
this.$refs.modalDetail.title = this.billType + "-三联打印预览"
}
})
},
//发起流程
handleWorkflow() {
getPlatformConfigByKey({"platformKey": "send_workflow_url"}).then((res)=> {
if (res && res.code === 200) {
let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.number
this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 500)
this.$refs.modalWorkflow.title = "发起流程"
}
})
},

11
jshERP-web/src/views/bill/mixins/BillListMixin.js
View File

@ -1,11 +1,13 @@
import Vue from 'vue'
import {getAction } from '@/api/manage'
import { FormTypes } from '@/utils/JEditableTableUtil'
import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount} from '@/api/api'
import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, getCurrentSystemConfig} from '@/api/api'
export const BillListMixin = {
data () {
return {
/* 原始审核是否开启 */
checkFlag: true,
supList: [],
cusList: [],
retailList: [],
@ -103,6 +105,13 @@ export const BillListMixin = {
onDateOk(value) {
console.log(value);
},
initSystemConfig() {
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{

11
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} from '@/api/api'
getPersonByNumType, getBatchNumberList, getCurrentSystemConfig} from '@/api/api'
import { getAction,putAction } from '@/api/manage'
import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
import { USER_INFO } from "@/store/mutation-types"
@ -29,6 +29,8 @@ export const BillModalMixin = {
minWidth: 1100,
isCanCheck: true,
isTenant: false,
/* 原始审核是否开启 */
checkFlag: true,
validatorRules:{
price:{
rules: [
@ -145,6 +147,13 @@ export const BillModalMixin = {
}
}
},
initSystemConfig() {
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -213,6 +213,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initDepot()
},
//提交单据时整理成formData

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -211,6 +211,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initDepot()
},
//提交单据时整理成formData

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -210,6 +210,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initDepot()
},
//提交单据时整理成formData

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -237,6 +237,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initSupplier()
this.initDepot()
},

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -237,6 +237,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initCustomer()
this.initDepot()
},

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -340,6 +340,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initSupplier()
this.initDepot()
this.initAccount()

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

@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -378,6 +378,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initSupplier()
this.initDepot()
this.initAccount()

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

@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -324,6 +324,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initSupplier()
this.initAccount()
},

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -317,6 +317,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initRetail()
this.initDepot()
this.initAccount()

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

@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -327,6 +327,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initRetail()
this.initDepot()
this.initAccount()

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -347,6 +347,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initCustomer()
this.initSalesman()
this.initDepot()

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

@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -307,6 +307,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initCustomer()
this.initSalesman()
this.initAccount()

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

@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -396,6 +396,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
this.initSystemConfig()
this.initCustomer()
this.initSalesman()
this.initDepot()

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

@ -86,8 +86,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -202,6 +202,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initRetail()
this.initUser()
this.initPerson()

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

@ -86,8 +86,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -200,6 +200,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initUser()
this.initPerson()
this.initAccount()

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

@ -95,8 +95,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1"@click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -211,6 +211,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initOrgan()
this.initUser()
this.initPerson()

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

@ -95,8 +95,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -211,6 +211,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initOrgan()
this.initUser()
this.initPerson()

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

@ -100,8 +100,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -220,6 +220,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initCustomer()
this.initUser()
this.initPerson()

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

@ -100,8 +100,8 @@
<a-dropdown>
<a-menu slot="overlay">
<a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
<a-menu-item key="2" v-if="checkFlag && btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
<a-menu-item key="3" v-if="checkFlag && btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
</a-menu>
<a-button>
批量操作 <a-icon type="down" />
@ -220,6 +220,7 @@
computed: {
},
created () {
this.initSystemConfig()
this.initSupplier()
this.initUser()
this.initPerson()

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

@ -18,8 +18,10 @@
<a-button v-if="financialType === '收款'" v-print="'#moneyInPrint'" ghost type="primary">打印</a-button>
<a-button v-if="financialType === '付款'" v-print="'#moneyOutPrint'" ghost type="primary">打印</a-button>
<!--反审核-->
<a-button v-if="isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
<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">
<!--收预付款-->
@ -394,16 +396,19 @@
</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 } from '@/api/api'
import { findFinancialDetailByNumber, getCurrentSystemConfig, getPlatformConfigByKey } from '@/api/api'
import WorkflowIframe from '@/components/tools/WorkflowIframe'
import JUpload from '@/components/jeecg/JUpload'
export default {
name: 'FinancialDetail',
components: {
WorkflowIframe,
JUpload
},
data () {
@ -416,6 +421,8 @@
isCanBackCheck: true,
financialType: '',
fileList: [],
/* 原始审核是否开启 */
checkFlag: true,
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@ -495,6 +502,7 @@
}
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params);
this.getSystemConfig()
}
})
},
@ -509,6 +517,23 @@
this.loading = false
})
},
getSystemConfig() {
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
//发起流程
handleWorkflow() {
getPlatformConfigByKey({"platformKey": "send_workflow_url"}).then((res)=> {
if (res && res.code === 200) {
let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.billNo
this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 500)
this.$refs.modalWorkflow.title = "发起流程"
}
})
},
handleBackCheck() {
let that = this
this.$confirm({

11
jshERP-web/src/views/financial/mixins/FinancialListMixin.js
View File

@ -1,10 +1,12 @@
import {findFinancialDetailByNumber, findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail,
getUserList, getPersonByType, getAccount} from '@/api/api'
getUserList, getPersonByType, getAccount, getCurrentSystemConfig} from '@/api/api'
import Vue from 'vue'
export const FinancialListMixin = {
data () {
return {
/* 原始审核是否开启 */
checkFlag: true,
supList: [],
cusList: [],
organList: [],
@ -80,6 +82,13 @@ export const FinancialListMixin = {
}
this.loadData(1);
},
initSystemConfig() {
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{

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

@ -1,5 +1,6 @@
import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount,getPersonByType,findInOutItemByParam} from '@/api/api'
import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount,
getPersonByType,findInOutItemByParam,getCurrentSystemConfig} from '@/api/api'
import { getAction,putAction } from '@/api/manage'
import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
import { USER_INFO } from "@/store/mutation-types"
@ -18,6 +19,8 @@ export const FinancialModalMixin = {
billStatus: '0',
isCanCheck: true,
isTenant: false,
/* 原始审核是否开启 */
checkFlag: true,
spans: {
labelCol1: {span: 2},
wrapperCol1: {span: 22},
@ -67,6 +70,13 @@ export const FinancialModalMixin = {
})
})
},
initSystemConfig() {
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -201,6 +201,7 @@
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.accountTable);
}
this.initSystemConfig()
this.initRetail()
this.initPerson()
this.initDetailAccount()

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -212,6 +212,7 @@
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.accountTable);
}
this.initSystemConfig()
this.initPerson()
this.initAccount()
this.initDetailAccount()

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -225,6 +225,7 @@
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.accountTable);
}
this.initSystemConfig()
this.initOrgan()
this.initPerson()
this.initInOutItem('in')

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -225,6 +225,7 @@
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.accountTable);
}
this.initSystemConfig()
this.initOrgan()
this.initPerson()
this.initInOutItem('out')

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -247,6 +247,7 @@
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.accountTable);
}
this.initSystemConfig()
this.initCustomer()
this.initPerson()
this.initAccount()

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

@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button v-if="checkFlag && isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
@ -250,6 +250,7 @@
let url = this.readOnly ? this.url.detailList : this.url.detailList;
this.requestSubTableData(url, params, this.accountTable);
}
this.initSystemConfig()
this.initSupplier()
this.initPerson()
this.initAccount()

8
jshERP-web/src/views/system/SystemConfigList.vue
View File

@ -86,7 +86,7 @@
<a-col :lg="12" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多级审核">
<a-switch checked-children="启用" un-checked-children="关闭" v-model="multiLevelApprovalFlagSwitch" @change="onMultiLevelApprovalChange"></a-switch>
（如果启用多级审核，则需配置流程，最多支持5级，开启后请刷新页面）
（如果启用多级审核，则需配置流程，开启会自动刷新浏览器）
</a-form-item>
</a-col>
<a-col :lg="12" :md="12" :sm="24"></a-col>
@ -122,6 +122,7 @@
minusStockFlagSwitch: false, //负库存状态
purchaseBySaleFlagSwitch: false, //以销定购状态
multiLevelApprovalFlagSwitch: false, //多级审核
originalMultiLevelApprovalFlag: '0', //原始多级审核状态
isReadOnly: false,
isShowApproval: false,
labelCol: {
@ -204,6 +205,7 @@
}
if (record.multiLevelApprovalFlag != null) {
this.multiLevelApprovalFlagSwitch = record.multiLevelApprovalFlag == '1' ? true : false;
this.originalMultiLevelApprovalFlag = record.multiLevelApprovalFlag
}
}
} else {
@ -236,6 +238,10 @@
if(res.code === 200){
this.init()
that.$message.info('保存成功！');
//如果多级审核切换状态需要刷新浏览器
if(this.originalMultiLevelApprovalFlag!= formData.multiLevelApprovalFlag) {
location.reload()
}
}else{
that.$message.warning(res.data.message);
}