diff --git a/src/pages/materialsStation/materialClerkConfirms/confirmDetails.vue b/src/pages/materialsStation/materialClerkConfirms/confirmDetails.vue index 3955601..1ff8459 100644 --- a/src/pages/materialsStation/materialClerkConfirms/confirmDetails.vue +++ b/src/pages/materialsStation/materialClerkConfirms/confirmDetails.vue @@ -102,6 +102,7 @@ const closePopup = () => { const confirmRemark = () => { console.log('opts:', opts.value) if (countdown.value > 0) return + popup.value.close() const params = { id: opts.value.id, leaseSignId: opts.value.leaseSignId, @@ -116,7 +117,6 @@ const confirmRemark = () => { }) confirmMaterialApi(params) .then((res) => { - popup.value.close() uni.hideLoading() loading.value = false // 返回 diff --git a/src/pages/standardBox/codeList.vue b/src/pages/standardBox/codeList.vue index 363679e..613de9b 100644 --- a/src/pages/standardBox/codeList.vue +++ b/src/pages/standardBox/codeList.vue @@ -845,14 +845,16 @@ const closePopup = () => { const confirmTransfer = () => { if (countdown.value > 0) return if(transferUser.value!=""){ + keeperPopup.value.close() + uni.showLoading({ title: '加载中...', mask: true }) let param = { "boxId":boxInfo.value.boxId, "transferUser":transferUser.value, } appTransferApi(param).then(res => { + uni.hideLoading() console.log(res) if(res.code=200){ - keeperPopup.value.close(); uni.showToast({ title: '移交成功!', icon: 'none' }) setTimeout(()=>{ uni.navigateBack({ @@ -862,6 +864,7 @@ const confirmTransfer = () => { } }).catch(error => { console.log(error) + uni.hideLoading() }) }else{ uni.showToast({ title: '请先勾选移交人!', icon: 'none' }) diff --git a/src/pages/standardBox/transferBox.vue b/src/pages/standardBox/transferBox.vue index ecd690f..b8d6d38 100644 --- a/src/pages/standardBox/transferBox.vue +++ b/src/pages/standardBox/transferBox.vue @@ -349,7 +349,8 @@ const onChangeChecked = (item) => { const confirmTransfer = () => { if (countdown.value > 0) return if(transferUser.value!=""){ - + keeperPopup.value.close() + uni.showLoading({ title: '加载中...', mask: true }) let param = { "boxId":transferItem.value.boxId, "inputUser":transferUser.value, @@ -357,14 +358,15 @@ const confirmTransfer = () => { console.log(param) appTransferApi(param).then(res => { + uni.hideLoading() console.log(res) if(res.code=200){ - keeperPopup.value.close(); uni.showToast({ title: '移交成功!', icon: 'none' }) getTableList(true) } }).catch(error => { console.log(error) + uni.hideLoading() }) }else{ uni.showToast({ title: '请先勾选移交人!', icon: 'none' })