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/donatereview/index.vue |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/project/donatereview/index.vue b/src/views/project/donatereview/index.vue
index b559561..6fb27c5 100644
--- a/src/views/project/donatereview/index.vue
+++ b/src/views/project/donatereview/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-form
+      class="opo-query-form"
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -397,7 +398,7 @@
                 v-model="form.birthday"
                 type="date" format="yyyy-MM-dd"
                 style="width: 174px"
-                value-format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鍑虹敓鏃ユ湡"
               >
               </el-date-picker>
@@ -757,7 +758,7 @@
                 size="small"
                 v-model="form.reporttime"
                 type="date" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="閫夋嫨鎶ュ憡鏃堕棿"
               >
               </el-date-picker>
@@ -1115,16 +1116,10 @@
       // this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
       // this.queryParams.residencecity = this.$refs.areaSelect.getShi();
       // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
-       if (this.starttime != "") {
-        this.queryParams.starttime = this.starttime;
-      } else {
-        this.queryParams.starttime = "";
-      }
-      if (this.endtime != "") {
-        this.queryParams.endtime = this.endtime;
-      } else {
-        this.queryParams.endtime = "";
-      }
+      // 鏈�夋椂闂磋寖鍥存椂浼� null锛氱┖涓蹭細璁╁悗绔嫾鍑� `donatetime >= ''`锛�
+      // MySQL 涓ユ牸妯″紡浼氭姤 Incorrect DATETIME value: ''锛堣 CHANGELOG 2026-10-22锛�
+      this.queryParams.starttime = this.starttime || null;
+      this.queryParams.endtime = this.endtime || null;
       listDonatebaseinfo(this.queryParams).then((response) => {
         console.log("getlist", response.rows);
         this.donatebaseinfoList = response.rows;

--
Gitblit v1.9.3