From 9573fd24f7b6df2149f022037056cdce084cd1d9 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 13 九月 2024 10:33:57 +0800
Subject: [PATCH] 拆机 可以根据患者 查找
---
src/views/ecg/doctor/DevDismantle.vue | 24 +++++++++++++-----------
src/api/ecg/devrent/index.ts | 4 ++--
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 2d14f11..8605fd7 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -47,8 +47,8 @@
},
// 鑾峰彇鎮ｈ�呰澶囨渶杩戠殑绉熻祦
- getLatestRent: async (devId: string) => {
- return await request.get({ url: `/ecg/dev-rent/get-latest-rent?&dev-id=` + devId })
+ getLatestRent: async (params: any) => {
+ return await request.get({ url: `/ecg/dev-rent/get-latest-rent`, params })
},
// 瑁呮満
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index a6c616c..bd01bc8 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -10,7 +10,7 @@
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo"/>
</el-form-item>
<el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
- <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" />
+ <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="searchRentInfo"/>
</el-form-item>
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
@@ -21,6 +21,7 @@
type="date"
value-format="x"
placeholder="閫夋嫨瑁呮満鏃堕棿"
+ readonly="true"
/>
</el-form-item>
<el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
@@ -45,14 +46,15 @@
</el-form-item>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
- <el-button @click="resetForm()">閲嶇疆</el-button>
+ <el-button @click="resetForm()">閲� 缃�</el-button>
+ <el-button @click="submitForm" :disabled="formLoading">閬� 澶�</el-button>
<!-- 鍖荤敓鎷嗘満鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="onCurChange" >
<el-table-column label="id" align="center" prop="id" />
- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />
- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />
+<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
+<!-- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />-->
<el-table-column label="鍖荤敓鍚嶇О" align="center" prop="docName" />
<el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
<el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
@@ -139,8 +141,8 @@
remark: undefined
})
const formRules = reactive({
- devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
- returnTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
+ // devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+ returnTime: [{ required: true, message: '璇烽�夋嫨鎷嗘満鏃ユ湡', trigger: 'blur' }],
})
const formRef = ref() // 琛ㄥ崟 Ref
@@ -183,14 +185,14 @@
}
const searchRentInfo = async () => {
- const data = await DevRentApi.getLatestRent(formData.value.devId)
+ const data = await DevRentApi.getLatestRent(formData.value)
console.info( data )
+ if (null === data)
+ return
+
+ formData.value = data
if (data.returnTime === null)
data.returnTime = new Date().getTime()
-
- if (null != data) {
- formData.value = data
- }
}
--
Gitblit v1.9.3