From 4682e95c58a6935dd72a89f0a45e76341ee5a5c6 Mon Sep 17 00:00:00 2001
From: zdnpc <9670595+zdbanality@user.noreply.gitee.com>
Date: Thu, 31 Aug 2023 09:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A9=B3=E5=9B=9E=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical-record/medical-record-apply.vue     |  1 +
 .../medical-record/medical-record-history.vue   | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/views/medical-record/medical-record-apply.vue b/src/views/medical-record/medical-record-apply.vue
index 3352f57..b55c452 100644
--- a/src/views/medical-record/medical-record-apply.vue
+++ b/src/views/medical-record/medical-record-apply.vue
@@ -1,3 +1,4 @@
+<!-- 蒙自市人民医院 -->
 <template>
 	<div class="ptint-reserve">
 		<select-patient-date :show-code="false"
diff --git a/src/views/medical-record/medical-record-history.vue b/src/views/medical-record/medical-record-history.vue
index 9104073..c496b92 100644
--- a/src/views/medical-record/medical-record-history.vue
+++ b/src/views/medical-record/medical-record-history.vue
@@ -1,3 +1,4 @@
+<!-- 蒙自市人民医院 -->
 <template>
 	<div class="history">
 		<select-patient-date :show-code="false"
@@ -12,7 +13,7 @@
 				<div class="record_item">
 					<div style="height: 50px;margin-right: 40px;padding: 8px 8px 0px;">
 						<div style="margin: 5px 0;">
-							<span style="color: var(--text-c);">申请时间：</span>{{ dateUto(item.applyTime) }}
+							<span style="color: var(--text-c);">申请时间：</span>{{ format(item.applyTime, 'yyyy-MM-dd hh:mm') }}
 						</div>
 						<div style="margin: 5px 0;">
 							<span style="color: var(--text-c);">申 请 人 ：</span>{{ item.applyName }}
@@ -22,6 +23,7 @@
 						<div><span style="color: var(--text-c);line-height: 20px;">住 院 号 ：</span>{{ item.treatId }}</div>
 						<div><span style="color: var(--text-c);line-height: 20px;">联系电话：</span>{{ item.phone}}</div>
 						<div><span style="color: var(--text-c);line-height: 20px;">用&emsp;&emsp;途：</span>{{ item.use }}</div>
+						<div v-if="item.rejectTime"><span style="color: var(--text-c);line-height: 20px;">驳回时间：</span>{{ format(item.rejectTime, 'yyyy-MM-dd hh:mm') }}</div>
 						<!-- <div><span style="color: var(--text-c);line-height: 20px;">住院科室：</span>{{ item.deptName }}</div> -->
 						<!-- <div><span style="color: var(--text-c);line-height: 20px;">获取方式：</span>{{ item.baBorrowGetway === 0?'自提': item.baBorrowGetway === 1?'邮寄': ''}}</div> -->
 						<!-- <div><span style="color: var(--text-c);line-height: 20px;">地&emsp;&emsp;址：</span>{{ item.baBorrowAddress }}</div> -->
@@ -63,10 +65,10 @@
 							 class="recipe_tag">待审核</div>
 					<div v-else-if="item.baBorrowIsApproved"
 							 class="recipe_tag"
-							 style="background-color: var(--color-primary);color: #fff;">已审核</div>
-					<div v-else-if="!item.baBorrowIsApproved"
+							 style="background-color: var(--color-primary);color: #fff;">已审核</div> -->
+					<div v-if="item.rejecter && item.rejectTime"
 							 class="recipe_tag"
-							 style="background-color: var(--color-danger);color: #fff;">驳 回</div> -->
+							 style="background-color: var(--color-danger);color: #fff;">驳 回</div>
 				</div>
 			</section>
 		</section>
@@ -158,17 +160,12 @@ export default {
 			})
 		}
 
-		function dateUto(time) {
-			const date = new Date(time)
-			return format(date, 'yyyy-MM-dd hh:mm')
-		}
-
 		return {
 			state,
 			toPay,
 			getSetup,
 			onImagePreview,
-			dateUto
+			format
 		}
 	}