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 |   76 ++++++++++++++++++++++++++------------
 1 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index ac949c6..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"
@@ -134,6 +135,16 @@
       border
       :data="donatebaseinfoList"
     >
+    <el-table-column
+        label="妗堜緥鏃堕棿"
+        align="center"
+        prop="donatetime"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="鎶ュ憡鏃堕棿"
         align="center"
@@ -155,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"
@@ -202,7 +225,7 @@
               :value="scope.row.workflow"
             />
           </div>
-          <div v-else>浠诲姟涓</div>
+          <div v-else>浠诲姟缁堟</div>
         </template>
       </el-table-column>
 
@@ -445,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="閫夋嫨姝讳骸鏃堕棿"
               >
@@ -470,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="閫夋嫨鎵嬫湳寮�濮嬫椂闂�"
               >
@@ -482,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="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
               >
@@ -503,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="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"
               >
@@ -519,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="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"
               >
@@ -541,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="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"
               >
@@ -557,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="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
               >
@@ -578,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="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"
               >
@@ -594,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="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
               >
@@ -612,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>
@@ -628,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>
@@ -685,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="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿"
                 >
@@ -846,7 +869,6 @@
 import OrgSelecter from "@/views/project/components/orgselect";
 import { updatedonatorno } from "@/api/project/relativesconfirmation";
 import { getToken } from "@/utils/auth";
-
 
 export default {
   components: {
@@ -1033,12 +1055,14 @@
     };
   },
   created() {
+    if (sessionStorage.getItem("donationwitness")) {
+      this.queryParams = JSON.parse(sessionStorage.getItem("donationwitness"));
+      console.log(this.queryParams, "queryParams");
+    }
     this.getCoordinatorList1();
     this.getCoordinatorList2();
   },
-  activated() {
-
-  },
+  activated() {},
   mounted(e) {
     this.selecttime = "";
     this.reportervalue = "";
@@ -1050,8 +1074,7 @@
     if (this.$route.params.starttime != null && this.$route.params.endtime) {
       this.selecttime = [
         this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
-        this.$moment(this.$route.params.endtime)
-          .format("YYYY-MM-DD")
+        this.$moment(this.$route.params.endtime).format("YYYY-MM-DD")
       ];
     }
     if (this.$route.params.reporterno != "") {
@@ -1195,6 +1218,11 @@
     getList(e) {
       this.loading = true;
       this.queryParams.params = {};
+      sessionStorage.removeItem("donationwitness");
+      sessionStorage.setItem(
+        "donationwitness",
+        JSON.stringify(this.queryParams)
+      );
       if (this.starttime != "") {
         this.queryParams.starttime = this.starttime;
       }
@@ -1359,7 +1387,7 @@
         path: "/organ/donationdetails/",
         query: {
           id: row.id,
-          organType: "edit",
+          organType: "edit"
         }
       });
       // this.reset();
@@ -1613,7 +1641,7 @@
             console.log(url);
             const link = document.createElement("a");
             link.href = url;
-            const name=fileUrl["downloadName"]
+            const name = fileUrl["downloadName"];
             link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
             document.body.appendChild(link);
             link.click();

--
Gitblit v1.9.3