From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 15 十月 2024 18:21:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/src/views/task/dangetDetail.vue | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admin/src/views/task/dangetDetail.vue b/admin/src/views/task/dangetDetail.vue index 34ba35b..700880c 100644 --- a/admin/src/views/task/dangetDetail.vue +++ b/admin/src/views/task/dangetDetail.vue @@ -1,5 +1,5 @@ <template> - <GlobalWindow :title="title" :visible.sync="isShowModal" @confirm="confirm"> + <GlobalWindow :title="title" :visible.sync="isShowModal" @close="close" @confirm="confirm"> <div class="modal_wrap"> <div class="modal_content"> <div class="header"> @@ -191,7 +191,7 @@ >杞氦</el-button > <el-button @click="isShowBack = true" type="danger" plain>閫�鍥�</el-button> - <el-button @click="isShowModal = false">杩斿洖</el-button> + <el-button @click="close">杩斿洖</el-button> </template> <!-- 鍚屾剰/鎷掔粷 --> <el-dialog @@ -481,6 +481,8 @@ this.subLoading = false this.$tip.apiSuccess('澶勭悊鎴愬姛') this.getDetail() + this.$emit('success') + this.$emit('close') this.isShowProblem = false }) .finally(() => { @@ -488,6 +490,10 @@ }) }) }, + close(){ + this.isShowModal = false + this.$emit('close') + }, onSubBack () { this.$refs.backForm.validate((valid) => { if (!valid) { -- Gitblit v1.9.3