From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/visSubDetail.vue | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/task/visSubDetail.vue b/admin/src/views/task/visSubDetail.vue
index 1ad582e..ce0413c 100644
--- a/admin/src/views/task/visSubDetail.vue
+++ b/admin/src/views/task/visSubDetail.vue
@@ -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"
@@ -231,11 +231,6 @@
2: '宸插悓鎰�',
3: '宸叉嫆缁�',
4: '宸插彇娑�',
- 5: '棰勭害鎴愬姛',
- 6: '棰勭害澶辫触',
- 7: '鎷滆涓�',
- 8: '宸茬绂�',
- 9: '宸插け鏁�'
},
cateList: {
0: '璁垮鐢宠',
--
Gitblit v1.9.3