From 97eb3bb65c0370c99eb1bbb7b8fadfffaab9d024 Mon Sep 17 00:00:00 2001
From: zdnpc <9670595+zdbanality@user.noreply.gitee.com>
Date: Fri, 18 Aug 2023 10:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=81=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=B7=B3=E5=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical-record/medical-record-apply.vue   | 31 +++++++++++--------
 .../medical-record/medical-record-history.vue | 24 +++++++++-----
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/views/medical-record/medical-record-apply.vue b/src/views/medical-record/medical-record-apply.vue
index c88bd78..e809dcb 100644
--- a/src/views/medical-record/medical-record-apply.vue
+++ b/src/views/medical-record/medical-record-apply.vue
@@ -20,8 +20,7 @@
 					<van-field v-model="form.diagnose"
 										 label="诊断"
 										 readonly
-										 required
-										 placeholder="选择住院记录"></van-field>
+										 :placeholder="form.zyNum? '': '选择住院记录'"></van-field>
 					<van-field v-model="form.applyName"
 										 label="病人姓名"
 										 readonly
@@ -131,17 +130,18 @@
 														:max-count="1"
 														:after-read="(file) => afterRead(file, 'inHospProve')">
 								<div style="height: 100%; display: flex;flex-direction: column;align-items: center;justify-content: center;">
-									<svg t="1686896283841"
+									<svg t="1692324646345"
 											 class="icon"
 											 viewBox="0 0 1024 1024"
 											 version="1.1"
 											 xmlns="http://www.w3.org/2000/svg"
-											 p-id="4962"
+											 p-id="3545"
+											 id="mx_n_1692324646346"
 											 width="64"
 											 height="64">
-										<path d="M230.4 364.8z m38.4-32c22.4 0 41.6-19.2 41.6-41.6V179.2c0-22.4-19.2-41.6-41.6-41.6-22.4 0-41.6 19.2-41.6 41.6v112c3.2 22.4 19.2 41.6 41.6 41.6zM928 265.6c-3.2-57.6-48-48-48-48h-32v96s-6.4 48-48 48h-80c-41.6 0-48-48-48-48v-96h-310.4v96s-6.4 48-48 48H230.4c-41.6 0-48-48-48-48v-96h-32s-44.8-9.6-48 48v560c0 57.6 57.6 57.6 57.6 57.6h713.6s57.6 0 57.6-57.6V268.8s-3.2 0-3.2-3.2zM515.2 764.8c0 44.8-83.2 54.4-160 54.4S192 809.6 192 764.8v-12.8c0-32 57.6-64 105.6-83.2 3.2 0 19.2-9.6 9.6-35.2-25.6-25.6-41.6-64-41.6-105.6 0-60.8 38.4-92.8 86.4-92.8s86.4 32 86.4 92.8c0 38.4-19.2 80-41.6 105.6-9.6 28.8 6.4 35.2 6.4 35.2 51.2 16 108.8 48 108.8 83.2 3.2 3.2 3.2 12.8 3.2 12.8z m291.2-12.8h-163.2c-22.4 0-41.6-19.2-41.6-41.6 0-22.4 19.2-41.6 41.6-41.6h163.2c22.4 0 41.6 19.2 41.6 41.6 0 25.6-19.2 41.6-41.6 41.6z m0-160h-163.2c-22.4 0-41.6-19.2-41.6-41.6 0-22.4 19.2-41.6 41.6-41.6h163.2c22.4 0 41.6 19.2 41.6 41.6s-19.2 41.6-41.6 41.6z m-6.4-227.2z m-41.6-32c22.4 0 41.6-19.2 41.6-41.6V179.2c0-22.4-19.2-41.6-41.6-41.6-22.4 0-41.6 19.2-41.6 41.6v112c0 22.4 19.2 41.6 41.6 41.6z"
-													fill="#dbdbdb"
-													p-id="4963"></path>
+										<path d="M950.8864 146.3296c21.2992 0 38.8096 6.8608 52.5312 20.5824C1017.1392 180.5312 1024 198.0416 1024 219.4432l0 585.1136c0 21.4016-6.8608 38.8096-20.5824 52.5312C989.696 870.8096 972.1856 877.6704 950.8864 877.6704L73.1136 877.6704c-21.2992 0-38.8096-6.8608-52.5312-20.5824C6.8608 843.4688 0 825.9584 0 804.5568L0 219.4432c0-21.2992 6.8608-38.912 20.5824-52.5312 13.7216-13.7216 31.232-20.5824 52.5312-20.5824l365.6704 0 0-128C438.8864 6.144 444.928 0 457.1136 0l109.6704 0c12.1856 0 18.3296 6.144 18.3296 18.3296l0 128L950.8864 146.3296zM987.4432 219.4432c0-24.3712-12.1856-36.5568-36.5568-36.5568L585.1136 182.8864l0 54.8864c0 12.288-6.144 18.3296-18.3296 18.3296L457.1136 256.1024c-12.1856 0-18.3296-6.0416-18.3296-18.3296L438.784 182.8864 73.1136 182.8864c-24.3712 0-36.5568 12.288-36.5568 36.5568l0 585.1136c0 24.3712 12.1856 36.5568 36.5568 36.5568l877.6704 0c24.3712 0 36.5568-12.1856 36.5568-36.5568L987.3408 219.4432zM438.8864 676.5568c0-35.0208-12.5952-65.1264-37.6832-90.3168S345.9072 548.5568 310.8864 548.5568 245.76 561.152 220.5696 586.24 182.8864 641.536 182.8864 676.5568c0 12.288-6.144 18.3296-18.3296 18.3296S146.3296 688.8448 146.3296 676.5568c0-45.6704 15.9744-84.5824 48.0256-116.5312C226.304 527.9744 265.1136 512 310.8864 512c45.6704 0 84.5824 15.9744 116.5312 48.0256 31.9488 31.9488 48.0256 70.8608 48.0256 116.5312 0 12.288-6.144 18.3296-18.3296 18.3296S438.8864 688.8448 438.8864 676.5568zM374.8864 484.5568C356.5568 502.8864 335.2576 512 310.8864 512S265.1136 502.8864 246.8864 484.5568 219.4432 444.928 219.4432 420.5568c0-24.3712 9.1136-45.6704 27.4432-64s39.6288-27.4432 64-27.4432 45.6704 9.1136 64 27.4432S402.3296 396.288 402.3296 420.5568C402.3296 444.928 393.1136 466.3296 374.8864 484.5568zM349.696 381.7472C339.0464 371.0976 326.144 365.6704 310.8864 365.6704c-15.2576 0-28.16 5.4272-38.8096 15.9744C261.3248 392.3968 256 405.4016 256 420.5568c0 15.2576 5.3248 28.2624 15.9744 38.8096C282.624 470.1184 295.6288 475.4432 310.8864 475.4432c15.2576 0 28.16-5.3248 38.8096-15.9744 10.6496-10.6496 15.9744-23.6544 15.9744-38.8096C365.6704 405.4016 360.3456 392.3968 349.696 381.7472zM475.4432 219.4432l73.1136 0L548.5568 36.5568 475.4432 36.5568 475.4432 219.4432zM859.4432 365.6704l-256 0c-12.1856 0-18.3296-6.0416-18.3296-18.3296 0-12.1856 6.144-18.3296 18.3296-18.3296l256 0c12.1856 0 18.3296 6.144 18.3296 18.3296C877.6704 359.6288 871.6288 365.6704 859.4432 365.6704zM859.4432 475.4432l-256 0c-12.1856 0-18.3296-6.0416-18.3296-18.3296 0-12.1856 6.144-18.3296 18.3296-18.3296l256 0c12.1856 0 18.3296 6.144 18.3296 18.3296C877.6704 469.4016 871.6288 475.4432 859.4432 475.4432zM859.4432 585.1136l-256 0c-12.1856 0-18.3296-6.0416-18.3296-18.3296 0-12.1856 6.144-18.3296 18.3296-18.3296l256 0c12.1856 0 18.3296 6.144 18.3296 18.3296C877.6704 579.072 871.6288 585.1136 859.4432 585.1136zM859.4432 694.8864l-256 0c-12.1856 0-18.3296-6.0416-18.3296-18.3296 0-12.1856 6.144-18.3296 18.3296-18.3296l256 0c12.1856 0 18.3296 6.144 18.3296 18.3296C877.6704 688.8448 871.6288 694.8864 859.4432 694.8864z"
+													p-id="3546"
+													fill="#DBDBDB"></path>
 									</svg>
 									<span>点击选择照片或拍照</span>
 								</div>
@@ -259,7 +259,6 @@
 
 <script>
 import { reactive, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
 import { axios } from 'axios'
 import { store } from 'vue-helper'
 import ImageUtil from '@/utils/image-util.mjs'
@@ -270,8 +269,6 @@ export default {
 		'select-patient-date': VueConfig.vueLoader('@/components/patient/select-patient-date.vue')
 	},
 	setup(props, context) {
-		const route = useRoute();
-		const router = useRouter();
 		const formRef = ref(null)
 		const state = reactive({
 			ispShow: false,             // 住院记录弹框
@@ -394,6 +391,7 @@ export default {
 					axios.post('wx/record/upload', params).then(response => {
 						if (response.code === 200) {
 							vant.Toast.success('预约成功')
+							resetForm()
 						} else {
 							vant.Toast.fail(response.message)
 						}
@@ -419,8 +417,8 @@ export default {
 				form.deptName = state.currTreat.leaveCategory
 				form.applyName = state.currTreat.patientName
 
-				form.patientId = patient.value.patientId,
-					form.idCardNo = patient.value.idCardNo
+				form.patientId = patient.value.patientId
+				form.idCardNo = patient.value.idCardNo
 				form.showCardNo = patient.value.showCardNo
 			}
 		}
@@ -452,7 +450,7 @@ export default {
 
 		watch(() => store.getters.getPatient, () => {
 			getMedicalRecordList()
-			Object.assign(form, creatForm())
+			resetForm()
 		})
 
 		function onTemplateConfirm(value) {
@@ -472,6 +470,13 @@ export default {
 			form[state] = file.content
 		}
 
+		function resetForm() {
+			Object.assign(form, creatForm())
+			state.img.idCardFront = []
+			state.img.idCardBack = []
+			state.img.inHospProve = []
+		}
+
 		return {
 			state,
 			formRef,
diff --git a/src/views/medical-record/medical-record-history.vue b/src/views/medical-record/medical-record-history.vue
index b3fdb43..9104073 100644
--- a/src/views/medical-record/medical-record-history.vue
+++ b/src/views/medical-record/medical-record-history.vue
@@ -12,7 +12,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>{{ item.applyTime }}
+							<span style="color: var(--text-c);">申请时间：</span>{{ dateUto(item.applyTime) }}
 						</div>
 						<div style="margin: 5px 0;">
 							<span style="color: var(--text-c);">申 请 人 ：</span>{{ item.applyName }}
@@ -20,10 +20,10 @@
 					</div>
 					<div style="padding: 0 8px 8px;">
 						<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><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;">联系电话：</span>{{ item.phone}}</div>
 						<!-- <div><span style="color: var(--text-c);line-height: 20px;">地&emsp;&emsp;址：</span>{{ item.baBorrowAddress }}</div> -->
 						<!-- <div><span style="color: var(--text-c);line-height: 20px;">备&emsp;&emsp;注：</span>{{ item.baBorrowNote }}</div> -->
 						<!-- <div><span style="color: var(--text-c);line-height: 20px;">页&emsp;&emsp;数：</span>{{ item.pages }}</div> -->
@@ -36,11 +36,14 @@
 						<div style="display: flex;">
 							<span style="color: var(--text-c);line-height: 20px;">图&emsp;&emsp;片：</span>
 							<div style="display: flex;flex-direction: row;justify-content: flex-start;color: var(--color-primary);">
-								<div v-if="item.idcardFront" style="margin-right: 14px;border-bottom: 1px solid var(--color-primary);"
+								<div v-if="item.idcardFront"
+										 style="margin-right: 14px;border-bottom: 1px solid var(--color-primary);"
 										 @click="onImagePreview(item.idcardFront)">身份证正面</div>
-								<div v-if="item.idcardBack" style="margin-right: 14px;border-bottom: 1px solid var(--color-primary);"
+								<div v-if="item.idcardBack"
+										 style="margin-right: 14px;border-bottom: 1px solid var(--color-primary);"
 										 @click="onImagePreview(item.idcardBack)">身份证背面</div>
-								<div v-if="item.inHospProve" style="border-bottom: 1px solid var(--color-primary);"
+								<div v-if="item.inHospProve"
+										 style="border-bottom: 1px solid var(--color-primary);"
 										 @click="onImagePreview(item.inHospProve)">住院证明</div>
 							</div>
 						</div>
@@ -91,10 +94,9 @@
 </template>
 <script>
 import { reactive, ref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-helper'
 import { axios } from 'axios'
 import { store } from 'vue-helper'
-
+import { format } from '@/utils/date-util.mjs'
 
 export default {
 	name: 'history',
@@ -156,11 +158,17 @@ export default {
 			})
 		}
 
+		function dateUto(time) {
+			const date = new Date(time)
+			return format(date, 'yyyy-MM-dd hh:mm')
+		}
+
 		return {
 			state,
 			toPay,
 			getSetup,
-			onImagePreview
+			onImagePreview,
+			dateUto
 		}
 	}