From 96cc62fd7c5957ff15e7eb7b897a038b029d83fa Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 10 九月 2024 14:15:26 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/JobRecordPanel.vue | 3 +--
src/api/ecg/devrent/index.ts | 7 ++++++-
src/assets/imgs/logo.png | 0
src/views/ecg/doctor/index.vue | 2 +-
.env | 6 +++---
src/views/ecg/doctor/components/DevRentPanel.vue | 30 ++++++++++++++++++++++--------
6 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/.env b/.env
index 4b0f5bf..419685b 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
# 鏍囬
-VITE_APP_TITLE=鑺嬮亾绠＄悊绯荤粺
+VITE_APP_TITLE=鍔ㄦ�佸績鐢佃鏈虹郴缁�
# 椤圭洰鏈湴杩愯绔彛鍙�
VITE_PORT=80
@@ -8,13 +8,13 @@
VITE_OPEN=true
# 绉熸埛寮�鍏�
-VITE_APP_TENANT_ENABLE=true
+VITE_APP_TENANT_ENABLE=false
# 楠岃瘉鐮佺殑寮�鍏�
VITE_APP_CAPTCHA_ENABLE=true
# 鏂囨。鍦板潃鐨勫紑鍏�
-VITE_APP_DOCALERT_ENABLE=true
+VITE_APP_DOCALERT_ENABLE=false
# 鐧惧害缁熻
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 7a92c82..2fb7c4c 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -2,7 +2,7 @@
// 瑁呮満鎷嗘満 VO
export interface DevRentVO {
- id: number // id
+ id: number | null // id
devId: string // 璁惧缂栧彿
patId: string // 鎮ｈ�呯紪鍙�
patName: string // 鎮ｈ�呭悕绉�
@@ -44,5 +44,10 @@
// 瀵煎嚭瑁呮満鎷嗘満 Excel
exportDevRent: async (params) => {
return await request.download({ url: `/ecg/dev-rent/export-excel`, params })
+ },
+
+ // 鑾峰彇鎮ｈ�呰澶囨渶杩戠殑绉熻祦
+ getLatestRent: async (patId: string, devId: string) => {
+ return await request.download({ url: `/ecg/dev-rent/get-latest-rent?pat-id=` + patId + '&dev-id=' + devId })
}
}
\ No newline at end of file
diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png
index 7e1043f..3b1f282 100644
--- a/src/assets/imgs/logo.png
+++ b/src/assets/imgs/logo.png
Binary files differ
diff --git a/src/views/ecg/doctor/components/DevRentPanel.vue b/src/views/ecg/doctor/components/DevRentPanel.vue
index b370bfd..5015812 100644
--- a/src/views/ecg/doctor/components/DevRentPanel.vue
+++ b/src/views/ecg/doctor/components/DevRentPanel.vue
@@ -1,5 +1,5 @@
<template>
- 褰撳墠鎮ｈ��: {{patient.patId}} {{patient.patName}}
+ 褰撳墠鎮ｈ��: {{patient.patId}} {{isStringEmpty(patient.patName)?'鏃�':patient.patName}}
<el-form
ref="formRef"
:model="formData"
@@ -8,7 +8,7 @@
v-loading="formLoading"
>
<el-form-item label="璁惧缂栧彿" prop="devId">
- <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
+ <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo"/>
</el-form-item>
<el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
@@ -43,10 +43,12 @@
<el-button @click="submitDismantleForm" type="primary" :disabled="formLoading">鎷嗘満</el-button>
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
</template>
+
<script setup lang="ts">
import {defineComponent, PropType} from "vue";
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
import {QueueVO} from "@/api/ecg/queue";
+import {isStringEmpty} from "@/utils/stringUtil";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineComponent({ name: 'DevRentPanel' })
@@ -81,8 +83,8 @@
})
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
- patId: [{ required: true, message: '鎮ｈ�呯紪鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
- patName: [{ required: true, message: '鎮ｈ�呭悕绉颁笉鑳戒负绌�', trigger: 'blur' }]
+ patId: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }],
+ patName: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }]
})
const formRef = ref() // 琛ㄥ崟 Ref
@@ -112,10 +114,12 @@
formLoading.value = true
try {
const data = formData.value as unknown as DevRentVO
+ data.id = null
data.patId = props.patient.patId
data.patName = props.patient.patName
if (formType.value === 'create') {
- await DevRentApi.createDevRent(data)
+ const result = await DevRentApi.createDevRent(data)
+ formData.value.id = result.data
message.success(t('common.createSuccess'))
} else {
await DevRentApi.updateDevRent(data)
@@ -138,8 +142,8 @@
formData.value = {
id: undefined,
devId: undefined,
- patId: undefined,
- patName: undefined,
+ patId: props.patient.patId,
+ patName: props.patient.patName,
rentTime: undefined,
returnTime: undefined,
interference: undefined,
@@ -149,4 +153,14 @@
}
formRef.value?.resetFields()
}
-</script>
\ No newline at end of file
+
+const searchRentInfo = async () => {
+ const result = await DevRentApi.getLatestRent(formData.value.patId, formData.value.devId!)
+ console.info( result )
+ if (null != result.data) {
+ formData.value = result.data
+ }
+}
+
+</script>
+
diff --git a/src/views/ecg/doctor/components/JobRecordPanel.vue b/src/views/ecg/doctor/components/JobRecordPanel.vue
index 277a70d..aa179fb 100644
--- a/src/views/ecg/doctor/components/JobRecordPanel.vue
+++ b/src/views/ecg/doctor/components/JobRecordPanel.vue
@@ -1,7 +1,6 @@
<script setup lang="ts">
import {defineComponent, PropType} from "vue";
import {PatientStatisticVO, RoomBedVO} from "@/api/ecg/doctor";
-import {dateFormatter} from "@/utils/formatTime";
defineComponent({
name: 'JobRecordPanel'
@@ -21,7 +20,7 @@
</script>
<template>
-
+ <div>浣滀笟璁板綍</div>
</template>
<style scoped lang="scss">
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 4358d23..4ecc39b 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -17,7 +17,7 @@
const onStagePatient = ref<QueueVO>({
bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
- patGender: 0, patId: "1", patName: "OKK", roomId: 0, roomName: "", seqNum: 0, status: 0
+ patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
})
const patientStat = ref<PatientStatisticVO>({
--
Gitblit v1.9.3