From ef0528a26977c6caeea69a091ccadfc62f18366a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 十月 2024 18:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/dangetDetail.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/task/dangetDetail.vue b/admin/src/views/task/dangetDetail.vue
index 34ba35b..35c7845 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,12 +481,18 @@
this.subLoading = false
this.$tip.apiSuccess('澶勭悊鎴愬姛')
this.getDetail()
+ this.$emit('success')
+ this.$emit('close')
this.isShowProblem = false
})
.finally(() => {
this.subLoading = false
})
})
+ },
+ close(){
+ this.isShowModal = false
+ this.$emit('close')
},
onSubBack () {
this.$refs.backForm.validate((valid) => {
@@ -595,6 +601,7 @@
</script>
<style lang="scss" scoped>
+@import "@/assets/style/variables.scss";
.upload_wrap {
display: flex;
flex-wrap: wrap;
@@ -794,7 +801,7 @@
font-size: 13px;
color: #888888;
.status {
- color: #00ba67;
+ color: $primaryColor;
}
}
.m_content {
--
Gitblit v1.9.3