diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index b72af459..b7d30f61 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -203,7 +208,11 @@ BillExcelIframe, BatchWaitBillList, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index b89a35ab..d295e41d 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -203,7 +208,11 @@ BillExcelIframe, BatchWaitBillList, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index ee7eed57..12b3ef58 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -215,7 +220,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 431f9120..a7f49269 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -238,7 +243,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 9b14e78a..e051f396 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -212,7 +217,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 926a4843..22847abe 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -208,7 +213,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index d1f1f7d4..b068ebda 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -44,7 +44,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -207,7 +212,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index f2753549..f9c0d2ff 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -45,7 +45,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -224,7 +229,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index f0fd717a..be922d42 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -45,7 +45,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -219,7 +224,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 9190de93..cf415c74 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -45,7 +45,12 @@ - + +
+ + + +
{{ item.supplier }} @@ -247,7 +252,11 @@ BillDetail, BillExcelIframe, JEllipsis, - JDate + JDate, + VNodes: { + functional: true, + render: (h, ctx) => ctx.props.vnodes, + } }, data () { return { diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index b88c860d..ef4aea67 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -16,6 +16,7 @@ export const BillListMixin = { isShowExcel: false, //以销定购的场景开关 purchaseBySaleFlag: false, + setTimeFlag: null, waitTotal: 0, dateFormat: 'YYYY-MM-DD', billExcelUrl: '', @@ -718,6 +719,45 @@ export const BillListMixin = { } } }, + 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) + }, + 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) + }, getDepotByCurrentUser() { getAction('/depot/findDepotByCurrentUser').then((res) => { if (res.code === 200) { diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 0b4cad42..15a892f9 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -45,6 +45,7 @@ export const BillModalMixin = { checkFlag: true, //零收付款的场景开关 zeroChangeAmountFlag: false, + setTimeFlag: null, validatorRules:{ price:{ rules: [ @@ -203,7 +204,7 @@ export const BillModalMixin = { }, initSupplier(isChecked) { let that = this; - findBySelectSup({}).then((res)=>{ + findBySelectSup({organId: this.model.organId}).then((res)=>{ if(res) { that.supList = res if(isChecked && res.length>0) { @@ -214,7 +215,7 @@ export const BillModalMixin = { }, initCustomer(isChecked) { let that = this; - findBySelectCus({}).then((res)=>{ + findBySelectCus({organId: this.model.organId}).then((res)=>{ if(res) { that.cusList = res if(isChecked && res.length>0) { @@ -225,7 +226,7 @@ export const BillModalMixin = { }, initRetail(isChecked) { let that = this; - findBySelectRetail({}).then((res)=>{ + findBySelectRetail({organId: this.model.organId}).then((res)=>{ if(res) { that.retailList = res if(isChecked && res.length>0) { @@ -283,6 +284,45 @@ export const BillModalMixin = { } }) }, + 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) + }, + 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) + }, handleManyAccount(){ this.selectAccount(0) }, diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 266318ab..7e35447c 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -27,7 +27,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchSupplier">
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index dda6f5e8..dc78805a 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -27,7 +27,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange" @search="handleSearchCustomer">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index c316582b..18a7d5ed 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -27,7 +27,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchSupplier">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 70c8ea2d..5523fc8e 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -29,7 +29,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchSupplier">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 853c7923..c108510d 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -29,7 +29,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchSupplier">
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index f0b7aefd..13489f0c 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -27,7 +27,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @search="handleSearchRetail">
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index ae8594a9..ddb26f7f 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -29,7 +29,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="onChangeOrgan" @search="handleSearchRetail">
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index bbe99e6e..ea5c1fb5 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -27,7 +27,7 @@ + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange" @search="handleSearchCustomer">
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 00a3fc6c..9f8dad0f 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -30,7 +30,7 @@ data-intro="客户必须选择,如果发现需要选择的客户尚未录入,可以在下拉框中点击新增客户进行录入。 特别注意,客户如果录入之后在下拉框中不显示,请检查是否给当前用户分配对应的客户权限"> + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange" @search="handleSearchCustomer">
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 06006aef..08c9e33a 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -30,7 +30,7 @@ data-intro="客户必须选择,如果发现需要选择的客户尚未录入,可以在下拉框中点击新增客户进行录入。 特别注意,客户如果录入之后在下拉框中不显示,请检查是否给当前用户分配对应的客户权限"> + :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children" @change="handleOrganChange" @search="handleSearchCustomer">