diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index 7d6143700..950512459 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -177,10 +177,10 @@
- - - - + + + +
@@ -359,24 +359,26 @@ export default { if (type != 1 && !desc) { return `请输入审批意见` } - this.$store.dispatch("call", { - url: 'approve/task/complete', - data: { - task_id: this.datas.task_id, - pass: type == 1, - comment: desc, - } - }).then(({msg}) => { - $A.messageSuccess(msg); - if (this.$route.name == 'manage-approve-details' || this.$route.name == 'manage-messenger') { - this.getInfo() - } else { - this.$emit('approve') - } - }).catch(({msg}) => { - $A.modalError(msg); - }); - return false + return new Promise((resolve, reject) => { + this.$store.dispatch("call", { + url: 'approve/task/complete', + data: { + task_id: this.datas.task_id, + pass: type == 1, + comment: desc, + } + }).then(({msg}) => { + $A.messageSuccess(msg); + if (this.$route.name == 'manage-approve-details' || this.$route.name == 'manage-messenger') { + this.getInfo() + } else { + this.$emit('approve') + } + resolve() + }).catch(({msg}) => { + reject(msg) + }); + }) } }); }, @@ -403,10 +405,8 @@ export default { this.$emit('revocation') } }).catch(({msg}) => { - $A.modalError(msg); - resolve(); + reject(msg); }); - return false }) }, });