From ef8b45aea99e31d95773d82f7508449489b6e278 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 九月 2024 17:49:26 +0800
Subject: [PATCH] 放弃装机功能
---
src/views/ecg/doctor/DevDismantle.vue | 159 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 129 insertions(+), 30 deletions(-)
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 7135947..a6c616c 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -1,5 +1,4 @@
<template>
- 褰撳墠鎮ｈ��: {{patient.patId}} {{isStringEmpty(patient.patName)?'鏃�':patient.patName}}
<el-form
ref="formRef"
:model="formData"
@@ -9,6 +8,12 @@
>
<el-form-item label="璁惧缂栧彿" prop="devId">
<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-form-item>
+ <el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
+ <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
<el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
@@ -40,7 +45,64 @@
</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>
+
+ <!-- 鍖荤敓鎷嗘満鍒楄〃 -->
+ <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="docName" />
+ <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
+ <el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
+ <el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
+ <el-table-column
+ label="浣滀笟鏃堕棿"
+ align="center"
+ prop="jobTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column
+ label="鍒涘缓鏃堕棿"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ v-hasPermi="['ecg:job-record:update']"
+ >
+ 缂栬緫
+ </el-button>
+ <el-button
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['ecg:job-record:delete']"
+ >
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉 -->
+ <Pagination
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </ContentWrap>
+
</template>
<script setup lang="ts">
@@ -48,6 +110,8 @@
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
import {QueueVO} from "@/api/ecg/queue";
import {isStringEmpty} from "@/utils/stringUtil";
+import {dateFormatter} from "@/utils/formatTime";
+import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineOptions({ name: 'DevrDismantle' })
@@ -62,18 +126,13 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
-const patient = ref<QueueVO>({
- patId: '',
- patName: ''
-})
-
const formData = ref({
id: undefined,
devId: undefined,
- patId: patient.value.patId,
- patName: patient.value.patName,
+ patId: undefined,
+ patName: undefined,
rentTime: undefined,
- returnTime: undefined,
+ returnTime: new Date().getTime(),
interference: undefined,
baseline: undefined,
detachment: undefined,
@@ -81,8 +140,7 @@
})
const formRules = reactive({
devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
- patId: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }],
- patName: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }]
+ returnTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
})
const formRef = ref() // 琛ㄥ崟 Ref
@@ -94,20 +152,14 @@
formLoading.value = true
try {
const data = formData.value as unknown as DevRentVO
- data.id = null
- data.patId = patient.value.patId
- data.patName = patient.value.patName
- if (formType.value === 'create') {
- const result = await DevRentApi.createDevRent(data)
- formData.value.id = result.data
- message.success(t('common.createSuccess'))
- } else {
- await DevRentApi.updateDevRent(data)
- message.success(t('common.updateSuccess'))
- }
+ //await DevRentApi.updateDevRent(data)
+ await DevRentApi.devDismantle(data)
+ message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('success')
+ resetForm()
+ getList()
} finally {
formLoading.value = false
}
@@ -118,10 +170,10 @@
formData.value = {
id: undefined,
devId: undefined,
- patId: patient.value.patId,
- patName: patient.value.patName,
+ patId: undefined,
+ patName: undefined,
rentTime: undefined,
- returnTime: undefined,
+ returnTime: new Date().getTime(),
interference: undefined,
baseline: undefined,
detachment: undefined,
@@ -131,12 +183,59 @@
}
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
+ const data = await DevRentApi.getLatestRent(formData.value.devId)
+ console.info( data )
+ if (data.returnTime === null)
+ data.returnTime = new Date().getTime()
+
+ if (null != data) {
+ formData.value = data
}
}
+
+const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
+const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁�
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ jobType: 1,
+ docId: undefined,
+ docName: undefined,
+ devId: undefined,
+ patId: undefined,
+ patName: undefined,
+ jobTime: [],
+ summary: undefined,
+ remark: undefined,
+ createTime: []
+})
+/** 鏌ヨ鍒楄〃 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await JobRecordApi.getJobRecordDoctorPage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+
+const onCurChange = (cur) => {
+ if (cur !== null)
+ getSelectedRent( cur.rentId )
+}
+
+const getSelectedRent = async (rentId) => {
+ formData.value = await DevRentApi.getDevRent(rentId)
+}
+
+/** 鍒濆鍖� **/
+onMounted(() => {
+ getList()
+})
+
</script>
--
Gitblit v1.9.3