From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本

---
 h5/pages/staff/task/vDangetAppr.vue |   84 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index a632b34..6eb1460 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -6,8 +6,14 @@
         statusMap[info.status]
       }}</view>
       <image
+        v-if="info.status == '1'"
+        src="@/static/ic_yizhenggai.png"
+        mode="widthFix"
+        class="status_img"
+      ></image>
+      <image
         v-if="info.status == '2'"
-        src="@/static/ic_passed@2x.png"
+        src="@/static/ic_yituihui-1.png"
         mode="widthFix"
         class="status_img"
       ></image>
@@ -27,13 +33,14 @@
           <image
             v-if="item.type == 0"
             :src="item.fileurlFull"
+            @click="priviewImage(item.fileurlFull)"
             mode="widthFix"
             class="img"
           />
           <video
             v-if="item.type == 1"
             :src="item.fileurlFull"
-            class="img"
+            class="video"
             controls
           />
         </view>
@@ -54,14 +61,14 @@
     <view v-if="info.status == 1" class="module_list">
       <view class="item">
         <view class="label">澶勭悊缁撴灉</view>
-        <!-- <view class="value">{{ info. }}</view> -->
+        <view class="value primaryColor">{{ statusMap[info.status] }}</view>
       </view>
       <view class="item">
         <view class="label">鏁存敼鍓�</view>
         <view class="value">
           <view
             class="adduser_list_item_ipt1_upload"
-            v-for="(item, i) in dealBeforeFileList"
+            v-for="(item, i) in info.dealBeforeFileList"
             :key="i"
             ><image
               v-if="item.type == 0"
@@ -77,7 +84,7 @@
         <view class="value">
           <view
             class="adduser_list_item_ipt1_upload"
-            v-for="(item, i) in dealAfterFileList"
+            v-for="(item, i) in info.dealAfterFileList"
             :key="i"
             ><image
               v-if="item.type == 0"
@@ -171,7 +178,15 @@
       </view>
     </view>
     <view class="emyty"></view>
-    <view class="main_footer">
+    <view
+      v-if="
+        info.approveDateVO != null &&
+        info.approveDateVO.canBeApproved != null &&
+        info.approveDateVO.canBeApproved == 1 &&
+        info.status == 0
+      "
+      class="main_footer"
+    >
       <view class="btn" @click="handleBack">閫�鍥�</view>
       <view class="btn transfer" @click="handleTransfer">杞氦</view>
       <view class="btn handle" @click="handleOpen">澶勭悊</view>
@@ -472,8 +487,8 @@
       ],
       statusMap: {
         0: '寰呭鐞�',
-        1: '澶勭悊涓�',
-        2: '瀹℃壒閫氳繃',
+        1: '宸叉暣鏀�',
+        2: '宸查��鍥�',
         3: '瀹℃壒鏈�氳繃',
         4: '宸插彇娑�',
         5: '浠栦汉鎴栫',
@@ -510,6 +525,11 @@
     this.getDetail()
   },
   methods: {
+    priviewImage(url) {
+      uni.previewImage({
+        urls: [url]
+      })
+    },
     handleOpen() {
       this.isShowHandle = true
       console.log('info', this.info)
@@ -587,10 +607,10 @@
     },
     getMemList() {
       findHiddenAreaMemberList({
-        model: { 
+        model: {
           ...this.transferModel,
           id: this.info.areaId
-         },
+        },
         ...this.pagination,
       }).then(res => {
         this.memberList = res.data || []
@@ -1017,6 +1037,34 @@
       }
     }
   }
+  .adduser_list_item_ipt1_upload {
+    width: 120rpx;
+    height: 120rpx;
+    margin-right: 24rpx;
+    border: 2rpx solid #e5e5e5;
+    background: #f7f7f7;
+    color: #666666;
+    font-size: 22rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    .close {
+      position: absolute;
+      right: -20rpx;
+      top: -20rpx;
+      z-index: 9999;
+    }
+    image {
+      width: 100%;
+      height: 100%;
+    }
+    video {
+      width: 100%;
+      max-height: 120rpx;
+    }
+  }
 
   .module_list {
     .item {
@@ -1079,13 +1127,12 @@
     }
     .file_list {
       display: flex;
-      flex-wrap: wrap;
       margin-bottom: 20rpx;
+      overflow-x: auto;
       .img_wrap {
         margin-top: 24rpx;
-        width: 120rpx;
-        height: 120rpx;
-        margin-right: 24rpx;
+        min-width: 160rpx;
+        height: 160rpx;
         border: 2rpx solid #e5e5e5;
         background: #f7f7f7;
         color: #666666;
@@ -1095,10 +1142,15 @@
         align-items: center;
         justify-content: center;
         position: relative;
+        margin-right: 16rpx;
+        flex-shrink: 0;
       }
       .img {
-        width: 120rpx;
-        max-height: 120rpx;
+        width: 100%;
+        max-height: 100%;
+      }
+      .video {
+        height: 160rpx;
       }
     }
     .text_wrap {

--
Gitblit v1.9.3