diff --git a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue index a887f9a4..24f77832 100644 --- a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue +++ b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue @@ -22,7 +22,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -104,6 +109,10 @@ mixins:[JeecgListMixin, mixinDevice], components: { BillDetail, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { @@ -113,7 +122,7 @@ organLabel: '', supplierList: [], queryParam: { - organId: "", + organId: undefined, number: "", materialParam: "", type: "", @@ -225,6 +234,29 @@ }) } }, + handleSearchSupplier(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + if(this.organLabel === '供应商') { + this.setTimeFlag = setTimeout(() => { + findBySelectSup({ key: value }).then((res) => { + if (res) { + that.supplierList = res; + } + }) + }, 500) + } else if(this.organLabel === '客户') { + this.setTimeFlag = setTimeout(() => { + findBySelectCus({ key: value }).then((res) => { + if (res) { + that.supplierList = res; + } + }) + }, 500) + } + }, close () { this.$emit('close'); this.visible = false; diff --git a/jshERP-web/src/views/financial/dialog/WaitNeedList.vue b/jshERP-web/src/views/financial/dialog/WaitNeedList.vue index 04f2df02..92052937 100644 --- a/jshERP-web/src/views/financial/dialog/WaitNeedList.vue +++ b/jshERP-web/src/views/financial/dialog/WaitNeedList.vue @@ -23,7 +23,12 @@ + :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children" @search="handleSearchSupplier"> +
+ + + +
{{ item.supplier }} @@ -68,6 +73,12 @@ export default { name: 'WaitNeedList', mixins:[JeecgListMixin], + components: { + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } + }, data () { return { title: "操作", @@ -75,6 +86,7 @@ disableMixinCreated: true, organType: '', actionType: '', + setTimeFlag: null, supList: [], selectBillRows: [], queryParam: { @@ -152,6 +164,29 @@ }) } }, + handleSearchSupplier(value) { + let that = this + if(this.setTimeFlag != null){ + clearTimeout(this.setTimeFlag); + } + if(this.organType === '客户') { + this.setTimeFlag = setTimeout(() => { + findBySelectCus({ key: value }).then((res) => { + if (res) { + that.supList = res + } + }) + }, 500) + } else if(this.organType === '供应商') { + this.setTimeFlag = setTimeout(() => { + findBySelectSup({ key: value }).then((res) => { + if (res) { + that.supList = res; + } + }) + }, 500) + } + }, //选择供应商进行付款,选择客户进行收款 handleAction(record) { let type = ''