From b9370c7e56779b08adbbc9c149f40023b577a92f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 19 九月 2024 11:18:25 +0800
Subject: [PATCH] 开诊界面 布局调整
---
src/views/ecg/doctor/components/DevInstallPanel.vue | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 031373b..c5d132d 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -23,13 +23,20 @@
</el-form-item>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</el-button>
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="resetForm()">閲� 缃�</el-button>
+ <el-button @click="printBill()">鎵撳嵃灏忕エ</el-button>
+ <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button>
<!-- 鍖荤敓鎷嗘満鍒楄〃 -->
<ContentWrap>
- <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="onCurChange" >
+ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick" >
<el-table-column label="id" align="center" prop="id" />
+ <el-table-column label="瑁呮満鎯呭喌" align="center" prop="cancelled" >
+ <template #default="scope">
+ {{scope.row.cancelled == 1 ? "鏀惧純" : "瀹屾垚"}}
+ </template>
+ </el-table-column>
<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
<!-- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />-->
<el-table-column label="鍖荤敓鍚嶇О" align="center" width="auto" prop="docName" />
@@ -40,7 +47,8 @@
label="浣滀笟鏃堕棿"
align="center"
prop="jobTime"
- :formatter="timeFormatter"
+ :formatter="dateFormatter"
+ width="180px"
/>
<!-- <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />-->
<el-table-column label="澶囨敞" align="center" prop="remark" />
@@ -52,6 +60,7 @@
:formatter="dateFormatter"
/>
-->
+<!--
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
@@ -72,6 +81,7 @@
</el-button>
</template>
</el-table-column>
+-->
</el-table>
<!-- 鍒嗛〉 -->
<Pagination
@@ -113,8 +123,8 @@
const formData = ref({
id: undefined,
devId: undefined,
- patId: patient.value.patId,
- patName: patient.value.patName,
+ patId: patient.value?.patId,
+ patName: patient.value?.patName,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
@@ -156,13 +166,29 @@
}
}
+const cancelInstall = async () => {
+ const data = formData.value as unknown as DevRentVO
+ if (formData.value.id === null || formData.value.id === undefined) {
+ const result = await DevRentApi.devCancel(data)
+ formData.value.id = result
+ message.success(t('鎿嶄綔鎴愬姛'))
+ } else {
+ await DevRentApi.devCancel(data)
+ message.success(t('鎿嶄綔鎴愬姛'))
+ }
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('success')
+ resetForm()
+ getList()
+}
+
/** 閲嶇疆琛ㄥ崟 */
const resetForm = () => {
formData.value = {
id: undefined,
devId: undefined,
- patId: patient.value.patId,
- patName: patient.value.patName,
+ patId: patient.value?.patId,
+ patName: patient.value?.patName,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
@@ -209,7 +235,7 @@
}
}
-const onCurChange = (cur) => {
+const onRowClick = (cur) => {
if (cur !== null)
getSelectedRent( cur.rentId )
}
@@ -218,6 +244,14 @@
formData.value = await DevRentApi.getDevRent(rentId)
}
+const printBill = async () => {
+ ElNotification({
+ title: '娓╅Θ鎻愮ず',
+ message: '寰呭疄鐜帮紒',
+ type: 'warning'
+ })
+}
+
/** 鍒濆鍖� **/
onMounted(() => {
getList()
--
Gitblit v1.9.3