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/relativesconfirmation/index.vue | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/views/project/relativesconfirmation/index.vue b/src/views/project/relativesconfirmation/index.vue
index d726dac..16d116d 100644
--- a/src/views/project/relativesconfirmation/index.vue
+++ b/src/views/project/relativesconfirmation/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"
@@ -128,7 +129,7 @@
</template>
</el-table-column>
<el-table-column
- label="鎶ュ憡鏃堕棿"
+ label="纭鏃堕棿"
align="center"
prop="reporttime"
width="120"
@@ -148,7 +149,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="鍖荤枟鏈烘瀯"
@@ -576,8 +589,8 @@
clearable
size="small"
v-model="form.signdate"
- 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>
@@ -733,8 +746,8 @@
size="small"
style="width: 310px"
v-model="evaluationForm.hospitalassesstime"
- 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>
@@ -780,8 +793,8 @@
size="small"
style="width: 310px"
v-model="evaluationForm.provincialassesstime"
- 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>
@@ -828,8 +841,8 @@
size="small"
style="width: 310px"
v-model="evaluationForm.coreteamassesstime"
- 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>
--
Gitblit v1.9.3