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 | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/views/project/donatereview/index.vue b/src/views/project/donatereview/index.vue
index 85ef268..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"
@@ -122,7 +123,7 @@
>
<!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> -->
<!-- <el-table-column type="selection" width="55" align="center" /> -->
-
+
<el-table-column
label="鎶ュ憡鏃堕棿"
align="center"
@@ -144,7 +145,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"
@@ -183,7 +196,7 @@
<el-button
size="mini"
type="text"
- icon="el-icon-edit"
+ icon="el-icon-view"
@click="handleShow(scope.row)"
v-hasPermi="['project:donatebaseinfo:edit']"
>鏌ョ湅</el-button
@@ -383,9 +396,9 @@
clearable
size="small"
v-model="form.birthday"
- type="date"
+ type="date" format="yyyy-MM-dd"
style="width: 174px"
- value-format="yyyy:MM:dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鍑虹敓鏃ユ湡"
>
</el-date-picker>
@@ -744,8 +757,8 @@
clearable
size="small"
v-model="form.reporttime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
+ type="date" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鎶ュ憡鏃堕棿"
>
</el-date-picker>
@@ -1103,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;
@@ -1628,7 +1635,6 @@
LoadReportList() {
listDonatebaseinfo().then((res) => {
- debugger
let list = res.rows;
let reportlist = [];
reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴" });
@@ -1638,7 +1644,6 @@
reportername: element.reportername,
});
});
- debugger
if (reportlist != 0) {
reportlist = this.resetArr(reportlist);
this.reportlist = reportlist;
--
Gitblit v1.9.3