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/donatefinishcheck/index.vue | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/views/project/donatefinishcheck/index.vue b/src/views/project/donatefinishcheck/index.vue
index 797fa34..6682c90 100644
--- a/src/views/project/donatefinishcheck/index.vue
+++ b/src/views/project/donatefinishcheck/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="app-container">
<el-form
+ class="opo-query-form"
:model="queryParams"
ref="queryForm"
:inline="true"
@@ -139,7 +140,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"
@@ -167,7 +180,7 @@
/>
</template>
</el-table-column>
-
+
<el-table-column
label="鎿嶄綔"
align="center"
@@ -238,8 +251,8 @@
clearable
size="small"
v-model="form.completetime"
- 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>
@@ -308,7 +321,7 @@
size="small"
style="width: 90%"
v-model="scope.row.transplanttime"
- type="date"
+ type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿"
>
@@ -489,7 +502,7 @@
</el-dialog>
-
+
</div>
@@ -885,16 +898,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;
// this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
// this.queryParams.residencecity = this.$refs.areaSelect.getShi();
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
--
Gitblit v1.9.3