diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue index 5d8441c0..ffec2cfc 100644 --- a/jshERP-web/src/components/jeecg/JEditableTable.vue +++ b/jshERP-web/src/components/jeecg/JEditableTable.vue @@ -234,6 +234,7 @@
+
diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 0baa1ada..e0375610 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -18,7 +18,11 @@ export const FinancialModalMixin = { billStatus: '0', isCanCheck: true, quickBtn: { - person: false + vendor: false, + customer: false, + account: false, + person: false, + inOutItem: false }, /* 原始审核是否开启 */ checkFlag: true, @@ -191,6 +195,11 @@ export const FinancialModalMixin = { this.$refs.personModalForm.title = "新增经手人"; this.$refs.personModalForm.disableSubmit = false; }, + addInOutItem(type) { + this.$refs.inOutItemModalForm.add(type); + this.$refs.inOutItemModalForm.title = "新增收支项目"; + this.$refs.inOutItemModalForm.disableSubmit = false; + }, vendorModalFormOk() { this.initSupplier() }, @@ -203,6 +212,9 @@ export const FinancialModalMixin = { personModalFormOk() { this.initPerson() }, + inOutItemModalFormOk(type) { + this.initInOutItem(type) + }, workflowModalFormOk() { this.close() }, @@ -337,6 +349,7 @@ export const FinancialModalMixin = { this.quickBtn.customer = btnStrList[i].url === '/system/customer'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.customer this.quickBtn.account = btnStrList[i].url === '/system/account'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.account this.quickBtn.person = btnStrList[i].url === '/system/person'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.person + this.quickBtn.inOutItem = btnStrList[i].url === '/system/in_out_item'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.inOutItem } } } diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index ee866e43..d5af9889 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -67,7 +67,12 @@ :rowSelection="true" :actionButton="true" @added="onAdded" - @valueChange="onValueChange" /> + @valueChange="onValueChange"> + + @@ -114,6 +119,7 @@ +