diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 329edfb2..74165789 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -785,7 +785,7 @@ export default { this.signVisible = false } }, - confirmReReading(row, type, open, signInfo) { + async confirmReReading(row, type, open, signInfo) { if (open) { this.rowData = { ...row } this.ConfirmReReadingVisible = true @@ -795,41 +795,41 @@ export default { return } if (type === 2) { - this.$refs.reasonForm.validate((valid) => { - if (!valid) return - var params = { - data: { - ConfirmReReadingList: [ - { - Id: row.Id, - OriginalReReadingTaskId: row.OriginalReReadingTaskId, - RootReReadingTaskId: row.RootReReadingTaskId, - NewReReadingTaskId: row.NewReReadingTaskId - } - ], - RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason, - TrialId: this.$route.query.trialId, - RequestReReadingResultEnum: type - }, - signInfo: signInfo - } - this.loading = true - this.btnLoading = true - confirmReReading(params).then(() => { - this.loading = false - this.btnLoading = false - // 同意申请成功/拒绝申请成功 - this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - this.$refs['signForm'].btnLoading = false - this.signVisible = false - this.getList() - this.ConfirmReReadingVisible = false - }).catch(() => { - this.loading = false - this.$refs['signForm'].btnLoading = false - this.btnLoading = false - }) - }) + let valid = await this.$refs.reasonForm.validate() + if (!valid) return + var params = { + data: { + ConfirmReReadingList: [ + { + Id: row.Id, + OriginalReReadingTaskId: row.OriginalReReadingTaskId, + RootReReadingTaskId: row.RootReReadingTaskId, + NewReReadingTaskId: row.NewReReadingTaskId + } + ], + RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason, + TrialId: this.$route.query.trialId, + RequestReReadingResultEnum: type + }, + signInfo: signInfo + } + this.loading = true + this.btnLoading = true + try { + await confirmReReading(params) + this.loading = false + this.btnLoading = false + // 同意申请成功/拒绝申请成功 + this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) + this.$refs['signForm'].btnLoading = false + this.signVisible = false + this.getList() + this.ConfirmReReadingVisible = false + } catch (e) { + this.loading = false + this.$refs['signForm'].btnLoading = false + this.btnLoading = false + } return } var params = { @@ -849,21 +849,29 @@ export default { } this.loading = true this.btnLoading = true - confirmReReading(params).then(() => { + try { + let res = await confirmReReading(params) this.loading = false this.btnLoading = false - // this.$message.success(`${type === 1 ? '同意' : '拒绝'}申请成功`) - // 同意申请成功/拒绝申请成功 - this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - this.ReReadingOrBackVisible = false this.$refs['signForm'].btnLoading = false - this.signVisible = false - this.getList() - }).catch(() => { + if (res.ErrorMessage) { + let alert = await this.$alert(res.ErrorMessage) + if (alert !== "confirm") return + this.ReReadingOrBackVisible = false + this.signVisible = false + this.getList() + } else { + // 同意申请成功/拒绝申请成功 + this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) + + this.signVisible = false + this.getList() + } + } catch (e) { this.loading = false this.$refs['signForm'].btnLoading = false this.btnLoading = false - }) + } }, assignSubjectTaskToDoctor(row, type) { this.rowData = { ...row }