From 28a20ffddf87558490b5ae6856effbd00a5098b0 Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Fri, 21 Feb 2025 18:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=E6=8A=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acupuncture-后台/src/views/report/manage.vue | 29 ++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/acupuncture-后台/src/views/report/manage.vue b/acupuncture-后台/src/views/report/manage.vue
index f61ecdc93..d8683ae69 100644
--- a/acupuncture-后台/src/views/report/manage.vue
+++ b/acupuncture-后台/src/views/report/manage.vue
@@ -2,7 +2,7 @@
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
 			label-width="80px">
-			<el-form-item label="组织名称" prop="name">
+			<el-form-item label="标题" prop="name">
 				<el-input v-model="queryParams.param.name" placeholder="请输入" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
@@ -24,14 +24,24 @@
 
 		<el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange" max-height="600">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column fixed label="标题" align="center" prop="name" min-width="100" />
-			<el-table-column fixed label="类型" align="center" prop="contactPhone" show-overflow-tooltip min-width="100">
+			<el-table-column fixed label="标题" align="center" prop="reportTitle" min-width="100" />
+			<el-table-column fixed label="类型" align="center" prop="typeName" show-overflow-tooltip min-width="100">
 			</el-table-column>
-			<el-table-column fixed label="开始时间" align="center" prop="contactPhone" show-overflow-tooltip
+			<el-table-column fixed label="开始时间" align="center" prop="timeRangeStart" show-overflow-tooltip
 				min-width="100">
+				<template slot-scope="scope">
+					<span>
+						{{ parseTime(scope.row.timeRangeStart, "{y}-{m}-{d}") }}
+					</span>
+				</template>
 			</el-table-column>
-			<el-table-column fixed label="结束时间" align="center" prop="contactPhone" show-overflow-tooltip
+			<el-table-column fixed label="结束时间" align="center" prop="timeRangeEnd" show-overflow-tooltip
 				min-width="100">
+				<template slot-scope="scope">
+					<span>
+						{{ parseTime(scope.row.timeRangeEnd, "{y}-{m}-{d}") }}
+					</span>
+				</template>
 			</el-table-column>
 			<el-table-column label="创建人/创建时间" align="center" min-width="140">
 				<template slot-scope="scope">
@@ -66,12 +76,12 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="开始时间" prop="timeRangeStart">
+				<el-form-item label="时间范围" prop="time">
 					<!-- <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="form.timeRangeStart"
 						type="date" placeholder="选择日期">
 					</el-date-picker> -->
 					<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="form.time" type="daterange"
-						range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+						range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @input="$forceUpdate()">
 					</el-date-picker>
 				</el-form-item>
 				<!-- <el-form-item label="结束时间" prop="timeRangeEnd">
@@ -211,7 +221,10 @@
 				this.open = true;
 				this.title = "修改上报";
 				this.form = JSON.parse(JSON.stringify(row))
-				this.form.time = [this.form.timeRangeStart,this.form.timeRangeEnd]
+				let timeRangeStart = this.parseTime(this.form.timeRangeStart, "{y}-{m}-{d}")
+				let timeRangeEnd = this.parseTime(this.form.timeRangeEnd, "{y}-{m}-{d}")
+				this.form.time[0] = timeRangeStart
+				this.form.time[1] = timeRangeEnd
 			},
 			/** 诊疗档案 */
 			submitForm: function() {