From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web

---
 src/views/project/donationwitness/index.vue |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index a6bbd22..828e00f 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-form
+      class="opo-query-form"
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -165,7 +166,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"
@@ -455,7 +468,7 @@
               <el-date-picker
                 clearable
                 v-model="form.deathtime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨姝讳骸鏃堕棿"
               >
@@ -480,7 +493,7 @@
               <el-date-picker
                 clearable
                 v-model="form.operationbegtime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�"
               >
@@ -492,7 +505,7 @@
               <el-date-picker
                 clearable
                 v-model="form.operationendtime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
               >
@@ -513,7 +526,7 @@
               <el-date-picker
                 clearable
                 v-model="form.abdominalaortacannulatime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"
               >
@@ -529,7 +542,7 @@
               <el-date-picker
                 clearable
                 v-model="form.abdominalaortaperfusiontime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"
               >
@@ -551,7 +564,7 @@
               <el-date-picker
                 clearable
                 v-model="form.portalveincannulatime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"
               >
@@ -567,7 +580,7 @@
               <el-date-picker
                 clearable
                 v-model="form.portalveinperfusiontime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
               >
@@ -588,7 +601,7 @@
               <el-date-picker
                 clearable
                 v-model="form.pulmonaryarterycannulatime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"
               >
@@ -604,7 +617,7 @@
               <el-date-picker
                 clearable
                 v-model="form.pulmonaryarteryperfusiontime"
-                type="datetime"
+                type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
               >
@@ -622,8 +635,8 @@
               <el-date-picker
                 clearable
                 v-model="form.aortacannulatime"
-                type="datetime"
-                value-format="yyyy-MM-dd  HH:mm:ss"
+                type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
               >
               </el-date-picker>
@@ -638,8 +651,8 @@
               <el-date-picker
                 clearable
                 v-model="form.aortaperfusiontime"
-                type="datetime"
-                value-format="yyyy-MM-dd  HH:mm:ss"
+                type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
               >
               </el-date-picker>
@@ -695,7 +708,7 @@
                   size="small"
                   style="width: 100%"
                   v-model="scope.row.organgettime"
-                  type="datetime"
+                  type="datetime" format="yyyy-MM-dd HH:mm"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿"
                 >

--
Gitblit v1.9.3