From f64155f6ad27c50451bb7d4a15f553bc72ead7de Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期五, 12 九月 2025 14:35:26 +0800
Subject: [PATCH] 年龄计算相关

---
 src/views/project/organallocation/index0.vue |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/views/project/organallocation/index0.vue b/src/views/project/organallocation/index0.vue
index f5d681f..7b1d4c8 100644
--- a/src/views/project/organallocation/index0.vue
+++ b/src/views/project/organallocation/index0.vue
@@ -47,7 +47,7 @@
       <!-- <el-row>
         <el-col :span="6">
           <el-form-item label="缁勯暱" prop="zuzhang">
-            <el-input         
+            <el-input
               v-model="queryParams.zuzhang"
             />
           </el-form-item>
@@ -82,7 +82,7 @@
     <el-table border v-loading="loading" :data="newdonateorganList" @selection-change="handleSelectionChange"
             highlight-current-row style="width: 100%">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <!-- <el-table-column  
+      <!-- <el-table-column
         label="鎹愮尞缂栧彿"
         width="160"
         align="center"
@@ -95,13 +95,25 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_organstate" :value="scope.row.organstate" />
         </template>
-      </el-table-column>      
+      </el-table-column>
       <el-table-column label="鍣ㄥ畼鍚嶇О" align="center" prop="organname" width="100" />
       <el-table-column label="绯荤粺缂栧彿" align="center" prop="ageunit" width="100" />
-      <el-table-column label="鍙椾綋濮撴皬" align="center" prop="name" width="100" />      
-      <el-table-column label="璇佷欢绫诲瀷" align="center" prop="age" width="100" />      
-      <el-table-column label="璇佷欢鍙�" align="center" prop="idcardno" width="100" />      
-      <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+      <el-table-column label="鍙椾綋濮撴皬" align="center" prop="name" width="100" />
+      <el-table-column label="璇佷欢绫诲瀷" align="center" prop="age" width="100" />
+      <el-table-column label="璇佷欢鍙�" align="center" prop="idcardno" 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" prop="sex" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
@@ -124,11 +136,11 @@
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)"
             v-hasPermi="['project:donateorgan:edit']">鏂板</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleEdit(scope.row)"
-            v-hasPermi="['project:donateorgan:remove']">淇敼</el-button>                        
+            v-hasPermi="['project:donateorgan:remove']">淇敼</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['project:donateorgan:remove']">鍒犻櫎</el-button>                        
+            v-hasPermi="['project:donateorgan:remove']">鍒犻櫎</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleRedo(scope.row)"
-            v-hasPermi="['project:donateorgan:remove']">閲嶆柊鍒嗛厤</el-button>        
+            v-hasPermi="['project:donateorgan:remove']">閲嶆柊鍒嗛厤</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleSave(scope.row)"
             v-hasPermi="['project:donateorgan:remove']">淇濆瓨</el-button>
         </template>
@@ -577,7 +589,7 @@
       });
     },
 
-    
+
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;

--
Gitblit v1.9.3