From 8e96b820c04571e2db816f2bcb373d7215c143dd Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 24 九月 2024 16:20:32 +0800
Subject: [PATCH] 装机 拆机 仅显示当天的作业
---
src/views/ecg/doctor/components/DevInstallPanel.vue | 123 +++++++++++++++++++++++++++++------------
1 files changed, 87 insertions(+), 36 deletions(-)
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 3b5a071..9a70bf5 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -8,7 +8,10 @@
v-loading="formLoading"
>
<el-form-item label="璁惧缂栧彿" prop="devId">
- <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
+ <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
+ </el-form-item>
+ <el-form-item label="璁惧鎻忚堪" prop="">
+ {{deviceInfo.brand + " " + deviceInfo.model}}
</el-form-item>
<el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
@@ -18,40 +21,31 @@
placeholder="閫夋嫨瑁呮満鏃堕棿"
/>
</el-form-item>
- <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
- <el-date-picker
- v-model="formData.returnTime"
- type="date"
- value-format="x"
- placeholder="閫夋嫨鎷嗘満鏃堕棿"
- />
- </el-form-item>
- <el-form-item label="骞叉壈鏁�" prop="interference">
- <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
- </el-form-item>
- <el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
- </el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
- <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
- </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</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="jobType" />
- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />
- <el-table-column label="鍖荤敓鍚嶇О" align="center" prop="docName" />
+ <el-table-column label="瑁呮満鎯呭喌" align="center" prop="cancelled" >
+ <template #default="scope">
+ <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span>
+ <span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span>
+ </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" />
<el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
- <el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
+<!-- <el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />-->
<el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
<el-table-column
label="浣滀笟鏃堕棿"
@@ -60,15 +54,17 @@
:formatter="dateFormatter"
width="180px"
/>
- <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />
+<!-- <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
@@ -89,6 +85,7 @@
</el-button>
</template>
</el-table-column>
+-->
</el-table>
<!-- 鍒嗛〉 -->
<Pagination
@@ -106,8 +103,10 @@
import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
import {QueueVO} from "@/api/ecg/queue";
import {isStringEmpty} from "@/utils/stringUtil";
-import {dateFormatter} from "@/utils/formatTime";
+import {dateFormatter, timeFormatter} from "@/utils/formatTime";
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
+import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
+import {curDayEnd, curDayStart} from "@/utils/dateUtil";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineComponent({ name: 'DevInstallPanel' })
@@ -130,8 +129,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,
@@ -147,6 +146,16 @@
})
const formRef = ref() // 琛ㄥ崟 Ref
+const deviceInfo = ref<DeviceVO> ({
+ id: 0,
+ devId: '',
+ category: '',
+ brand: '',
+ model: '',
+ purchaseDate: 0,
+ lost: 0,
+})
+
/** 鎻愪氦琛ㄥ崟 */
const submitForm = async () => {
// 鏍￠獙琛ㄥ崟
@@ -155,8 +164,6 @@
formLoading.value = true
try {
const data = formData.value as unknown as DevRentVO
- data.patId = patient.value.patId
- data.patName = patient.value.patName
if (formData.value.id === null || formData.value.id === undefined) {
const result = await DevRentApi.devInstall(data)
formData.value.id = result
@@ -168,10 +175,27 @@
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('success')
+ resetForm()
getList()
} finally {
formLoading.value = false
}
+}
+
+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()
}
/** 閲嶇疆琛ㄥ崟 */
@@ -189,6 +213,10 @@
remark: undefined
}
formRef.value?.resetFields()
+
+ deviceInfo.value.category = ''
+ deviceInfo.value.brand = ''
+ deviceInfo.value.model = ''
}
const setPatient = (queueVO: QueueVO | undefined) => {
@@ -204,17 +232,18 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- jobType: 0,
+ jobType: [10, 30],
docId: undefined,
docName: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
- jobTime: [],
+ jobTime: [curDayStart(), curDayEnd()],
summary: undefined,
remark: undefined,
createTime: []
})
+
/** 鏌ヨ鍒楄〃 */
const getList = async () => {
loading.value = true
@@ -227,14 +256,36 @@
}
}
-const onCurChange = (cur) => {
- getSelectedRent( cur.rentId )
+const onRowClick = (cur) => {
+ if (cur !== null)
+ getSelectedRent( cur.rentId )
}
const getSelectedRent = async (rentId) => {
formData.value = await DevRentApi.getDevRent(rentId)
}
+const printBill = async () => {
+ ElNotification({
+ title: '娓╅Θ鎻愮ず',
+ message: '寰呭疄鐜帮紒',
+ type: 'warning'
+ })
+}
+
+const getDevInfo = async () => {
+ deviceInfo.value.category = ''
+ deviceInfo.value.brand = ''
+ deviceInfo.value.model = ''
+ if (isStringEmpty(formData.value.devId))
+ return
+
+ const data = await DeviceApi.getDeviceByDevId(formData.value.devId!)
+ console.info( data )
+ if ( null !== data)
+ deviceInfo.value = data
+}
+
/** 鍒濆鍖� **/
onMounted(() => {
getList()
--
Gitblit v1.9.3