diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index e03a33ada..0bf3d3ee8 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -571,15 +571,7 @@ const buttonBaseClick = (val) => { } // 保存 else if (val == 'save') { - let timer = null - if(!timer){ - submitForm() - timer = setTimeout(()=>{ - if(timer){ - clearTimeout(timer) - } - },2000) - } + submitForm() } // 关闭 else if (val == 'close') { diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue index adf88fab7..4ebcad026 100644 --- a/src/components/XButton/src/ButtonBase.vue +++ b/src/components/XButton/src/ButtonBase.vue @@ -71,18 +71,19 @@ const props = defineProps({ // 传递给父类 const emit = defineEmits(['buttonBaseClick', 'updataTableColumns']) +let timer = ref(null) const buttonBaseClick = (val, item, $event) => { - let timer = null - if(!timer){ + if(!timer.value){ clearButtonBlurHandle($event) //解决el-button点击后颜色不恢复问题 emit('buttonBaseClick', val, item, $event) - timer = setTimeout(()=>{ - if(timer){ - clearTimeout(timer) + timer.value = setTimeout(()=>{ + if(timer.value){ + console.log('清空timer',timer.value) + clearTimeout(timer.value) + timer.value = null } },2000) } - } const popoverVisible = ref(false) // 关闭页面 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 53b7e8806..c5c0335e4 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -425,13 +425,7 @@ const getFormLocationList = async () => { options.originLocationList = await getLocationList({ type: 'TRANSPORT' }) options.locationList = [...options.originLocationList] }else{ - options.locationList = [] - let timer = setTimeout(()=>{ - options.locationList = [...options.originLocationList] - if(timer){ - clearTimeout(timer) - } - },2000) + options.locationList = [...options.originLocationList] } }