From 6ace58ac8d2a1122940600ceffdbe1c679a10cfb Mon Sep 17 00:00:00 2001
From: yxh <17293325@qq.com>
Date: 星期一, 20 四月 2026 09:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

---
 src/views/project/donatefinishcheck/index.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/project/donatefinishcheck/index.vue b/src/views/project/donatefinishcheck/index.vue
index 797fa34..b33269b 100644
--- a/src/views/project/donatefinishcheck/index.vue
+++ b/src/views/project/donatefinishcheck/index.vue
@@ -139,7 +139,19 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+      <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+        <template slot-scope="scope">
+           {{
+            `${
+              scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+            } ${
+              scope.row.age2 && scope.row.age2 !== 0
+                ? `${scope.row.age2}${scope.row.ageunit2}`
+                : ""
+            }`.trim()
+          }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="鐜版墍鍦ㄥ湴甯�"
         align="center"
@@ -167,7 +179,7 @@
           />
         </template>
       </el-table-column>
-      
+
       <el-table-column
         label="鎿嶄綔"
         align="center"
@@ -489,7 +501,7 @@
     </el-dialog>
 
 
-     
+
 
 
   </div>

--
Gitblit v1.9.3