diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 075ff00d..40194891 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -37,12 +37,6 @@ export const BillModalMixin = { }; }, created () { - this.initSupplier() - this.initCustomer() - this.initRetail() - this.initSalesman() - this.initDepot() - this.initAccount() }, computed: { readOnly: function() { @@ -112,13 +106,14 @@ export const BillModalMixin = { getAction('/depot/findDepotByCurrentUser').then((res) => { if(res.code === 200){ let arr = res.data - for(let i=0; i{ if(res) { - for(let i=0; i{ if(res && res.code === 200) { let list = res.data.accountList; - for(let i=0; i - + {{ item.name }} @@ -125,7 +126,7 @@ dataSource: [], columns: [ { title: '账户名称',key: 'accountId',width: '20%', type: FormTypes.select, placeholder: '请选择${title}', options: [], - validateRules: [{ required: true, message: '${title}不能为空' }] + allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '金额',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请选择${title}', validateRules: [{ required: true, message: '${title}不能为空' }] @@ -164,8 +165,6 @@ } }, created () { - this.initAccount() - this.initDetailAccount() }, methods: { //调用完edit()方法之后会自动调用此方法 @@ -187,6 +186,9 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } + this.initPerson() + this.initAccount() + this.initDetailAccount() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index 3ccd23a2..c26672f6 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -66,7 +66,8 @@ - + {{ item.name }} @@ -133,7 +134,7 @@ dataSource: [], columns: [ { title: '收入项目',key: 'inOutItemId',width: '20%', type: FormTypes.select, placeholder: '请选择${title}', options: [], - validateRules: [{ required: true, message: '${title}不能为空' }] + allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '金额',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请选择${title}', validateRules: [{ required: true, message: '${title}不能为空' }] @@ -177,8 +178,6 @@ } }, created () { - this.initInOutItem('in') - this.initAccount() }, methods: { //调用完edit()方法之后会自动调用此方法 @@ -200,6 +199,10 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } + this.initCustomer() + this.initPerson() + this.initInOutItem('in') + this.initAccount() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index a7da9ef7..2dc8548d 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -66,7 +66,8 @@ - + {{ item.name }} @@ -133,7 +134,7 @@ dataSource: [], columns: [ { title: '支出项目',key: 'inOutItemId',width: '20%', type: FormTypes.select, placeholder: '请选择${title}', options: [], - validateRules: [{ required: true, message: '${title}不能为空' }] + allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '金额',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请选择${title}', validateRules: [{ required: true, message: '${title}不能为空' }] @@ -177,8 +178,6 @@ } }, created () { - this.initInOutItem('out') - this.initAccount() }, methods: { //调用完edit()方法之后会自动调用此方法 @@ -200,6 +199,10 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } + this.initSupplier() + this.initPerson() + this.initInOutItem('out') + this.initAccount() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 751c000e..a5257328 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -81,7 +81,8 @@ - + {{ item.name }} @@ -192,7 +193,6 @@ } }, created () { - this.initAccount() }, methods: { //调用完edit()方法之后会自动调用此方法 @@ -214,6 +214,9 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } + this.initCustomer() + this.initPerson() + this.initAccount() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 5543ce9b..f5e64d75 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -81,7 +81,8 @@ - + {{ item.name }} @@ -195,7 +196,6 @@ } }, created () { - this.initAccount() }, methods: { //调用完edit()方法之后会自动调用此方法 @@ -217,6 +217,9 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } + this.initSupplier() + this.initPerson() + this.initAccount() }, //提交单据时整理成formData classifyIntoFormData(allValues) {