diff --git a/components/buns-order-templates/bo-page-cart-scan-tmp.vue b/components/buns-order-templates/bo-page-cart-scan-tmp.vue index bb54453..eae0cb7 100644 --- a/components/buns-order-templates/bo-page-cart-scan-tmp.vue +++ b/components/buns-order-templates/bo-page-cart-scan-tmp.vue @@ -5,7 +5,7 @@ + @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left"> @@ -120,9 +120,8 @@ initData() { this.submitParam.billCode = this.queryOption.billCode }, - async handleSubmit(val) { + async handleSubmit() { let extParam = {} - val && (extParam.billCode = val); await checkParams(this.submitParam, this.submitValidConfig) // 转换图片格式 extParam.picUrl = this.submitParam.picUrl.join(",") @@ -136,7 +135,7 @@ } }, handleScanValChange: debounce(function(val){ - val && (this.handleSubmit(val)) + this.handleSubmit() }), resetForm() { this.submitParam.billCode = '' diff --git a/components/buns-order-templates/bo-page-fajian-scan-tmp.vue b/components/buns-order-templates/bo-page-fajian-scan-tmp.vue index 0248fda..b7a6be5 100644 --- a/components/buns-order-templates/bo-page-fajian-scan-tmp.vue +++ b/components/buns-order-templates/bo-page-fajian-scan-tmp.vue @@ -5,7 +5,7 @@ + @scanChange="handleScanValChange" :showConfirm="true" @confirmClick="handleScanValChange" iconPos="left"> @@ -99,9 +99,8 @@ initData() { this.submitParam.billCode = this.queryOption.billCode }, - async handleSubmit(val) { + async handleSubmit() { let extParam = {} - val && (extParam.billCode = val); await checkParams(this.submitParam, this.submitValidConfig) let scnParam = getScanParams(scanTypeEnum.faJian, { ...this.submitParam, ...extParam }) let res = await apiService.scanRecord({...scnParam, _loading: true}) @@ -112,8 +111,8 @@ this.resetForm() } }, - handleScanValChange: debounce(function(val){ - val && (this.handleSubmit(val)) + handleScanValChange: debounce(function(){ + this.handleSubmit() }), resetForm() { this.submitParam.billCode = '' diff --git a/components/tpx-scan-input/tpx-scan-input.vue b/components/tpx-scan-input/tpx-scan-input.vue index e737f1a..f3ba111 100644 --- a/components/tpx-scan-input/tpx-scan-input.vue +++ b/components/tpx-scan-input/tpx-scan-input.vue @@ -1,16 +1,22 @@ @@ -50,6 +56,11 @@ return '' } }, + showConfirm:{ + default () { + return false + } + }, }, data() { }, @@ -77,6 +88,9 @@ handleScanChange(val){ this.$emit('scanChange', val) this.handleChange(val) + }, + handleConfirm(){ + this.$emit('confirmClick') } } } diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue index 2fb2b18..d4dc5ee 100644 --- a/components/tpx-scroll-view/tpx-scroll-view.vue +++ b/components/tpx-scroll-view/tpx-scroll-view.vue @@ -26,7 +26,9 @@ watch: { searchParam: { handler: function(cval, oval) { - this.getDataList(true) + if(this.autoReload) { + this.getDataList(true) + } }, deep: true } @@ -41,6 +43,11 @@ } }, props: { + autoReload: { + default () { + return true + } + }, searchParam: { default () { return {} diff --git a/pages/deliveryDeal/arriveList.vue b/pages/deliveryDeal/arriveList.vue index 726fc41..6a4afca 100644 --- a/pages/deliveryDeal/arriveList.vue +++ b/pages/deliveryDeal/arriveList.vue @@ -4,14 +4,14 @@