From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/task/visSubDetail.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/task/visSubDetail.vue b/admin/src/views/task/visSubDetail.vue
index 1ad582e..d9f19b2 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>
@@ -115,7 +115,7 @@
<div class="company">
{{ item.memberName }}
<div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
- 锛�<span class="status" :class="{ padding: item.statusInfo == '澶勭悊涓�' || item.status == '1' }">{{
+ 锛�<span :class="{ padding: item.statusInfo == '澶勭悊涓�' || item.status == '1' }">{{
item.statusInfo || ""
}}</span>锛�
</div>
@@ -130,7 +130,7 @@
" class="remark">
{{ item.checkInfo || "" }}
</div>
- <div v-if="item.approveType == 1 || item.approveType == 0" class="childList">
+ <div v-if="item.approveType == 1" class="childList">
<div class="m_content company" v-for="item1 in item.approveList" :key="item1.id">
<img v-if="item1.faceImg != null && item1.faceImg != ''" :src="item1.faceImg" class="avatar" alt="" />
<img v-if="item1.faceImg == null || item1.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"
@@ -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">
@@ -231,11 +231,6 @@
2: '宸插悓鎰�',
3: '宸叉嫆缁�',
4: '宸插彇娑�',
- 5: '棰勭害鎴愬姛',
- 6: '棰勭害澶辫触',
- 7: '鎷滆涓�',
- 8: '宸茬绂�',
- 9: '宸插け鏁�'
},
cateList: {
0: '璁垮鐢宠',
@@ -265,6 +260,8 @@
this.subLoading = false
this.$tip.apiSuccess('澶勭悊鎴愬姛')
this.getDetail()
+ this.$emit('success')
+ this.$emit('close')
this.isShowAppr = false
})
.finally(() => {
@@ -272,6 +269,10 @@
})
})
})
+ },
+ close(){
+ this.isShowModal = false
+ this.$emit('close')
},
getDetail() {
const { id, type } = this
@@ -515,7 +516,7 @@
color: #888888;
.status {
- color: #00ba67;
+ color: $primaryColor;
}
}
--
Gitblit v1.9.3