diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index 722f4f1c..3adb44b0 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -27,7 +27,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -149,7 +154,11 @@ AdvanceInModal, FinancialDetail, BillExcelIframe, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index e004fdc1..19bd70fb 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -27,7 +27,12 @@
- + +
+ + + +
{{ item.supplier }} @@ -167,7 +172,11 @@ ItemInModal, FinancialDetail, BillExcelIframe, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index b5d4a136..2a2bb5c0 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -27,7 +27,12 @@
- + +
+ + + +
{{ item.supplier }} @@ -167,7 +172,11 @@ ItemOutModal, FinancialDetail, BillExcelIframe, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index a3051ae5..986d2bdb 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -27,7 +27,12 @@
- + +
+ + + +
{{ item.supplier }} @@ -167,7 +172,11 @@ MoneyInModal, FinancialDetail, BillExcelIframe, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index ab75ca66..15c7f88d 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -27,7 +27,12 @@
- + +
+ + + +
{{ item.supplier }} @@ -166,7 +171,11 @@ MoneyOutModal, FinancialDetail, BillExcelIframe, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js index f608c045..01e985f3 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js @@ -11,6 +11,7 @@ export const FinancialListMixin = { checkFlag: true, /* 单据Excel是否开启 */ isShowExcel: false, + setTimeFlag: null, billExcelUrl: '', prefixNo: '', waitTotal: 0, @@ -191,6 +192,58 @@ export const FinancialListMixin = { } }) }, + handleSearchSupplier(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectSup({key: value}).then((res) => { + if(res) { + that.supList = res; + } + }) + },500) + }, + handleSearchCustomer(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectCus({key: value}).then((res) => { + if(res) { + that.supList = res; + } + }) + },500) + }, + handleSearchOrgan(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectOrgan({key: value}).then((res) => { + if(res) { + that.organList = res; + } + }) + },500) + }, + handleSearchRetail(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectRetail({key: value}).then((res) => { + if(res) { + that.supList = res; + } + }) + },500) + }, onDateChange: function (value, dateString) { this.queryParam.beginTime=dateString[0] this.queryParam.endTime=dateString[1] diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index a700bc15..5c9ebe2a 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -27,6 +27,7 @@ export const FinancialModalMixin = { }, /* 原始审核是否开启 */ checkFlag: true, + setTimeFlag: null, spans: { labelCol1: {span: 2}, wrapperCol1: {span: 22}, @@ -100,7 +101,7 @@ export const FinancialModalMixin = { }, initSupplier() { let that = this; - findBySelectSup({}).then((res)=>{ + findBySelectSup({organId: this.model.organId}).then((res)=>{ if(res) { that.supList = res; } @@ -108,7 +109,7 @@ export const FinancialModalMixin = { }, initCustomer() { let that = this; - findBySelectCus({}).then((res)=>{ + findBySelectCus({organId: this.model.organId}).then((res)=>{ if(res) { that.cusList = res; } @@ -116,7 +117,7 @@ export const FinancialModalMixin = { }, initOrgan() { let that = this; - findBySelectOrgan({}).then((res)=>{ + findBySelectOrgan({organId: this.model.organId}).then((res)=>{ if(res) { that.organList = res; } @@ -124,7 +125,7 @@ export const FinancialModalMixin = { }, initRetail() { let that = this; - findBySelectRetail({}).then((res)=>{ + findBySelectRetail({organId: this.model.organId}).then((res)=>{ if(res) { that.retailList = res; } @@ -187,6 +188,58 @@ export const FinancialModalMixin = { } }) }, + handleSearchSupplier(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectSup({key: value}).then((res) => { + if(res) { + that.supList = res; + } + }) + },500) + }, + handleSearchCustomer(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectCus({key: value}).then((res) => { + if(res) { + that.supList = res; + } + }) + },500) + }, + handleSearchOrgan(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectOrgan({key: value}).then((res) => { + if(res) { + that.organList = res; + } + }) + },500) + }, + handleSearchRetail(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + this.setTimeFlag = setTimeout(()=>{ + findBySelectRetail({key: value}).then((res) => { + if(res) { + that.supList = res; + } + }) + },500) + }, //选择供应商或客户的触发事件 onChangeOrgan(value) { this.accountTable.dataSource = [] diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index 52e0f10b..07afabb7 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -24,7 +24,12 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchRetail"> +
+ + + +
{{ item.supplier }} diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index a3cc0546..ce9646d2 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -24,7 +24,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchOrgan">
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index 2af08de7..ee69d62a 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -24,7 +24,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchOrgan">
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index ca9bc469..04316c9b 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -24,7 +24,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="onChangeOrgan" @search="handleSearchCustomer">
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 20c85516..080319d4 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -24,7 +24,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="onChangeOrgan" @search="handleSearchSupplier">