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/ethicalReview/index.vue |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index 5a420d8..ab43674 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-form
+      class="opo-query-form"
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -85,7 +86,7 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="鎶ュ憡鏃ユ湡">
+          <el-form-item label="瀹℃煡鏃堕棿">
             <el-date-picker
               style="width: 100%"
               v-model="selecttime"
@@ -123,8 +124,30 @@
       :data="listnews"
       border
     >
+      <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" prop="name" width="120" />
-      <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" prop="sex" width="100">
         <template slot-scope="scope">
           <dict-tag
@@ -141,17 +164,17 @@
       <el-table-column
         label="浼︾悊瀹℃煡缁撹"
         align="center"
-        prop="flowconclusion"
+        prop="expertconclusion"
         width="100"
       >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.sys_EthicalReview"
-            :value="scope.row.flowconclusion"
+            :value="scope.row.expertconclusion"
           />
         </template>
       </el-table-column>
-      <el-table-column label="瀹℃煡鎰忚" align="center" prop="flowcontent" />
+      <el-table-column label="瀹℃煡鎰忚" align="center" prop="expertopinion" />
       <el-table-column
         label="瀹℃煡鏃堕棿"
         align="center"
@@ -270,7 +293,7 @@
                 clearable
                 size="small"
                 v-model="form.createTime"
-                type="date"
+                type="date" format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨缁撹鏃堕棿"
               >
@@ -636,6 +659,10 @@
       this.queryParams.city = this.$route.params.city;
     }
     this.getuserlist();
+    if (sessionStorage.getItem("ethicalReview")) {
+      this.queryParams = JSON.parse(sessionStorage.getItem("ethicalReview"));
+      console.log(this.queryParams, "queryParams");
+    }
     this.getList();
   },
   activated() {},
@@ -736,8 +763,9 @@
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      console.log(this.starttime, "this.starttime");
-      console.log(this.endtime, "this.endtime");
+      sessionStorage.removeItem("ethicalReview");
+      sessionStorage.setItem("ethicalReview", JSON.stringify(this.queryParams));
+
       if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
         this.queryParams.params[
           "beginReporttime"

--
Gitblit v1.9.3