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/visSubDetail.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/task/visSubDetail.vue b/admin/src/views/task/visSubDetail.vue
index ce0413c..db8dd9b 100644
--- a/admin/src/views/task/visSubDetail.vue
+++ b/admin/src/views/task/visSubDetail.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">
@@ -78,7 +78,7 @@
<el-table-column label="鍏徃鍚嶇О" prop="companyName" min-width="120" />
<el-table-column label="浜鸿劯鐓х墖" prop="" min-width="80">
<template slot-scope="{ row }">
- <el-image :src="row.prefix + row.faceImg" :preview-src-list="[row.prefix + row.faceImg]">
+ <el-image v-if="row.prefix && row.faceImg" :src="row.prefix + row.faceImg" :preview-src-list="[row.prefix + row.faceImg]">
</el-image>
</template>
</el-table-column>
@@ -154,7 +154,7 @@
info.approveDateVO.canBeApproved != null &&
info.approveDateVO.canBeApproved == 1
">鎷掔粷</el-button>
- <el-button @click="isShowModal = false">杩斿洖</el-button>
+ <el-button @click="close">杩斿洖</el-button>
</template>
<!-- 鍚屾剰/鎷掔粷 -->
<el-dialog append-to-body :title="param.status == 2 ? '鍚屾剰' : '鎷掔粷'" :visible.sync="isShowAppr" width="480px">
@@ -260,6 +260,8 @@
this.subLoading = false
this.$tip.apiSuccess('澶勭悊鎴愬姛')
this.getDetail()
+ this.$emit('success')
+ this.$emit('close')
this.isShowAppr = false
})
.finally(() => {
@@ -268,6 +270,10 @@
})
})
},
+ close(){
+ this.isShowModal = false
+ this.$emit('close')
+ },
getDetail() {
const { id, type } = this
console.log(id, type)
--
Gitblit v1.9.3