From e4a06e0730dc0aa6ced97cbb3362d6b8ef473d39 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 15:56:34 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/task/visReportDetail.vue |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/admin/src/views/task/visReportDetail.vue b/admin/src/views/task/visReportDetail.vue
index cfa2f3d..83c8ce0 100644
--- a/admin/src/views/task/visReportDetail.vue
+++ b/admin/src/views/task/visReportDetail.vue
@@ -1,21 +1,19 @@
 <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">
-          <img v-if="info.businessStatus == '3'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png"
+          <img v-if="info.businessStatus == '3'" class="head_bg" src="@/assets/task/bg_shenhe_fail@2x.png" alt="">
+          <img v-else-if="info.businessStatus == '2'" class="head_bg" src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
+          <img v-else-if="info.businessStatus == '4'" class="head_bg" src="@/assets/task/bg_shenhe_chexiao@2x.png"
             alt="">
-          <img v-else-if="info.businessStatus == '2'" class="head_bg"
-            src="@/assets/task/bg_shenhe_pass@2x.png" alt="">
-          <img v-else-if="info.businessStatus == '4'" class="head_bg" src="@/assets/task/bg_shenhe_chexiao@2x.png" alt="">
           <img v-else class="head_bg" src="@/assets/task/bg_shenhe@2x.png" alt="">
           <div class="left">
             <div class="h1">{{ cateList[type] }}</div>
             <div class="time">鎻愪氦鏃堕棿锛歿{ info.createDate }}</div>
           </div>
-          <div class="right"
-            :class="{ scs: info.businessStatus == '2', msg: info.businessStatus == '3' }">{{
-              statusMap[info.businessStatus] }}</div>
+          <div class="right" :class="{ scs: info.businessStatus == '2', msg: info.businessStatus == '3' }">{{
+            statusMap[info.businessStatus] }}</div>
         </div>
         <div class="info">
           <div class="title">璁垮鎶ュ淇℃伅</div>
@@ -83,7 +81,7 @@
                     <div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
                       锛�<span :class="{ padding: item.statusInfo == '澶勭悊涓�' || item.status == '1' }">{{
                         item.statusInfo || ""
-                        }}</span>锛�
+                      }}</span>锛�
                     </div>
                   </div>
                 </div>
@@ -96,7 +94,7 @@
             " class="remark">
               {{ item.checkInfo || "" }}
             </div>
-            <div v-if="item.approveType == 1" class="childList">
+            <div v-if="item.approveType == 0 || item.type == 1 || 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"
@@ -120,7 +118,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="apprTitle" :visible.sync="isShowAppr" width="480px">
@@ -228,6 +226,8 @@
                 this.subLoading = false
                 this.$tip.apiSuccess('澶勭悊鎴愬姛')
                 this.getDetail()
+                this.$emit('success')
+                this.$emit('close')
                 this.isShowAppr = false
               })
               .finally(() => {
@@ -236,10 +236,26 @@
           })
       })
     },
+    close() {
+      this.isShowModal = false
+      this.$emit('close')
+    },
     getDetail() {
       const { id } = this
       getVisitedReDetail({ id }).then(res => {
         this.info = res
+        if (this.info.approveDateVO && this.info.approveDateVO.approveList.length > 0) {
+          this.info.approveDateVO.approveList.forEach(item => {
+            if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
+              item.title = item.approveList[0].title
+              item.faceImg = item.approveList[0].faceImg
+              item.memberName = item.approveList[0].memberName
+              item.statusInfo = item.approveList[0].statusInfo
+              item.status = item.approveList[0].status
+              item.approveList = []
+            }
+          })
+        }
       })
     },
     handleAppr(val) {
@@ -457,7 +473,7 @@
           color: #888888;
 
           .status {
-            color: #00ba67;
+            color: $primaryColor;
           }
         }
 

--
Gitblit v1.9.3