diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 1a33fa7e..1741df04 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -236,11 +236,18 @@ export const BillModalMixin = { if(res && res.code === 200) { let list = res.data.accountList let lastId = list.length>0?list[0].id:'' - list.splice(0,0,{id: 0, name: '多账户'}) - that.accountList = list - if(isChecked) { - that.form.setFieldsValue({'accountId': lastId}) - } + getCurrentSystemConfig().then((res) => { + if (res.code === 200 && res.data) { + let multiAccountFlag = res.data.multiAccountFlag + if(multiAccountFlag==='1') { + list.splice(0,0,{id: 0, name: '多账户'}) + } + } + that.accountList = list + if(isChecked) { + that.form.setFieldsValue({'accountId': lastId}) + } + }) } }) }, diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue index f03afd74..4fa94f41 100644 --- a/jshERP-web/src/views/system/SystemConfigList.vue +++ b/jshERP-web/src/views/system/SystemConfigList.vue @@ -116,7 +116,12 @@
(启用后,多级审核需配置流程,开启后需刷新浏览器才能看到效果)点此刷新 - + + + + (启用后,采购订单、采购入库、采购退货、销售订单、销售出库、销售退货等单据的结算账户可以进行多账户选择) + + @@ -155,8 +160,8 @@ originalMultiLevelApprovalFlag: '0', //原始多级审核状态 multiBillTypeSelect: [], //单据类型 originalMultiBillTypeSelect: [], //原始单据类型 - isReadOnly: false, - isShowApproval: false, + isShowApproval: false, //是否展示多级审核 + multiAccountFlagSwitch: false, //多账户审核 labelCol: { xs: { span: 24 }, sm: { span: 5 }, @@ -249,6 +254,9 @@ this.multiBillTypeSelect = record.multiBillType.split(',') this.originalMultiBillTypeSelect = record.multiBillType } + if (record.multiAccountFlag != null) { + this.multiAccountFlagSwitch = record.multiAccountFlag == '1' ? true : false; + } } } else { this.$message.info(res.data); @@ -361,6 +369,10 @@ this.model.multiBillType = this.multiBillTypeSelect.join(",") this.handleChange() }, + onMultiAccountChange(checked) { + this.model.multiAccountFlag = checked?'1':'0' + this.handleChange() + }, //改变内容 handleChange() { this.confirmLoading = true