Merge branch 'main-20240105'

main
jwg 7 months ago
commit 4c1d597a57

@ -115,25 +115,51 @@ export default {
}
this.$loading(true, 'loadingSb')
if (this.key == 2) {
/* approveTask(obj)
.then(() => {
this.$EventBus.$emit('handleResetLive', 'company-myTrips')
this.$EventBus.$emit('handleResetLive', 'company-myClaim')
history.back()
this.$loading(false, 'loadingSb')
})
.catch(() => {
this.$loading(false, 'loadingSb')
})
} else {
rejectTask(obj)
.then(() => {
this.$EventBus.$emit('handleResetLive', 'company-myTrips')
this.$EventBus.$emit('handleResetLive', 'company-myClaim')
history.back()
this.$loading(false, 'loadingSb')
})
.catch(() => {
this.$loading(false, 'loadingSb')
}) */
approveTask(obj)
.then(() => {
this.$forceCloseLoading()
this.$EventBus.$emit('handleResetLive', 'company-myTrips')
this.$EventBus.$emit('handleResetLive', 'company-myClaim')
history.back()
this.$loading(false, 'loadingSb')
})
.catch(() => {
this.$forceCloseLoading()
this.$loading(false, 'loadingSb')
})
} else {
rejectTask(obj)
.then(() => {
this.$forceCloseLoading()
this.$EventBus.$emit('handleResetLive', 'company-myTrips')
this.$EventBus.$emit('handleResetLive', 'company-myClaim')
history.back()
this.$loading(false, 'loadingSb')
})
.catch(() => {
this.$forceCloseLoading()
this.$loading(false, 'loadingSb')
})
}

@ -18,8 +18,7 @@ const router = new VueRouter({
// 0.8秒后强制清除loading
const hideToastLoading = debounceFun(() => {
Vue.prototype.$forceCloseLoading()
}, 3 * 1000, false)
console.log('路由缓存...');
}, 1000, false)
let isFetchPermissionInfo = false
const fetchPermissionInfo = async () => {
let obj = {}

Loading…
Cancel
Save