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/donateannex/index.vue | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/views/project/donateannex/index.vue b/src/views/project/donateannex/index.vue
index a212994..9a28fff 100644
--- a/src/views/project/donateannex/index.vue
+++ b/src/views/project/donateannex/index.vue
@@ -154,7 +154,7 @@
:value="scope.row.recordstate"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" width="120" />
@@ -163,7 +163,21 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="120" />
+ <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.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
--
Gitblit v1.9.3