From 936c01060eea0924b88ca5c35d221a972a6aba7d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 05 十月 2026 10:47:22 +0800
Subject: [PATCH] 检查单列表调整
---
src/views/ecg/doctor/DevDismantle.vue | 200 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 163 insertions(+), 37 deletions(-)
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index bfc89c7..5272561 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -1,41 +1,41 @@
+<!--鎷嗘満鐣岄潰-->
<template>
<el-form
+ class="patient-compact-form"
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
+ <!-- ===== 缂栬緫鍖猴紙闇�瑕佸綍鍏ョ殑瀛楁锛�===== -->
<el-row :gutter="20">
- <el-col :span="12">
+ <el-col :span="6">
+ <el-form-item label="鐢宠鍗曞彿" prop="applyNo">
+ <el-input v-model="formData.applyNo" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="妫�鏌ラ」鐩�" prop="">
+ {{ formData?.checkType && getCheckTypeName(formData?.checkType) }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎮h�呯紪鍙�" prop="">
+ <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎮h�呭鍚�" prop="patName">
+ <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="璁惧缂栧彿" prop="devId">
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" />
</el-form-item>
- <el-form-item label="璁惧鎻忚堪" prop="">
- {{formData.brand + " " + formData.model}}
- </el-form-item>
- <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
- <el-date-picker
- v-model="formData.rentTime"
- 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="detachment">
- <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
- </el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鎮h�呯紪鍙�" prop="patId">
- <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
- </el-form-item>
- <el-form-item label="鎮h�呭悕绉�" prop="patName">
- <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
- </el-form-item>
+ <el-col :span="6">
<el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
<el-date-picker
v-model="formData.returnTime"
@@ -44,18 +44,41 @@
placeholder="閫夋嫨鎷嗘満鏃堕棿"
/>
</el-form-item>
- <el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="骞叉壈鏁�" prop="interference">
+ <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑴辫惤" prop="detachment">
+ <el-switch v-model="formData.detachment" :active-value="1" :inactive-value="0" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍩虹嚎绮�" prop="baseline">
+ <el-switch v-model="formData.baseline" :active-value="1" :inactive-value="0" />
</el-form-item>
</el-col>
</el-row>
+
+ <!-- ===== 鎮h�呬俊鎭紙闇�姹�1锛�18 椤圭粺涓�灞曠ず锛�**涓�琛屽洓鍒�**锛�=====
+ 鍚庣 DevRentRespVO 宸叉墿瀛楁骞跺洖濉� -->
+ <PatientInfoBlock :data="formData" check-type-field="checkType" :span="6" />
+
+ <!-- ===== 璁惧淇℃伅锛堜竴琛屽洓鍒楋級=====
+ 銆岃澶囩紪鍙� / 鎷嗘満鏃堕棿 / 骞叉壈鏁� / 鑴辫惤 / 鍩虹嚎绮椼�嶅凡鍦ㄤ笂鏂圭紪杈戝尯褰曞叆锛�
+ 姝ゅ鍙灞曠ず鍏朵綑璁惧瀛楁锛堣鏈烘椂闂淬�佺櫥璁版椂闂淬�佽澶囨弿杩扮瓑锛� -->
+ <DeviceInfoBlock :data="formData" time-label-mode="dismantle" :span="6" />
+
+ <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="resetForm()">閲� 缃�</el-button>
<el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
+ <el-button @click="damageDismantle" :disabled="formLoading">鎹� 姣�</el-button>
<!-- 鍖荤敓鎷嗘満鍒楄〃 -->
<ContentWrap>
@@ -65,6 +88,7 @@
<template #default="scope">
<span v-if="scope.row.jobType === 20">"宸叉媶鏈�"</span>
<span v-if="scope.row.jobType === 40">"宸查仐澶�"</span>
+ <span v-if="scope.row.jobType === 42">"宸叉崯姣�"</span>
</template>
</el-table-column>
<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
@@ -126,12 +150,17 @@
import {dateFormatter} from "@/utils/formatTime";
import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
import {isStringEmpty} from "@/utils/stringUtil";
-import {curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {calculateHours, curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {AppointmentApi} from "@/api/ecg/appointment";
+import {tranlateDevState} from "../../../utils/statusFormatter";
+// 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤圭粺涓�灞曠ず鍧�
+import PatientInfoBlock from "@/views/ecg/doctor/components/PatientInfoBlock.vue";
+import DeviceInfoBlock from "@/views/ecg/doctor/components/DeviceInfoBlock.vue";
/** 瑁呮満鎷嗘満 琛ㄥ崟 */
defineOptions({ name: 'DevrDismantle' })
-const emit = defineEmits(['success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+const emit = defineEmits(['event_dismantle_success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -150,6 +179,37 @@
/** 鎻愪氦琛ㄥ崟 */
const submitForm = async () => {
+ const data = formData.value as unknown as DevRentVO
+ const durationHours = calculateHours(data.rentTime!, data.returnTime!)
+ if (durationHours > 20) {
+ _submitForm()
+ return;
+ }
+
+ ElMessageBox.confirm(
+ '绂昏鏈轰笉鍒�20灏忔椂锛岀‘瀹氳鎷嗘満鍚楋紵',
+ 'Warning',
+ {
+ confirmButtonText: '濂界殑',
+ cancelButtonText: '涓嶇敤',
+ type: 'warning',
+ }
+ )
+ .then(async () => {
+ _submitForm()
+ })
+ .catch(() => {
+/*
+ ElNotification({
+ title: '娓╅Θ鎻愮ず',
+ message: '纭澶辫触',
+ type: 'warning'
+ })
+*/
+ })
+}
+
+const _submitForm = async () => {
// 鏍¢獙琛ㄥ崟
await formRef.value.validate()
// 鎻愪氦璇锋眰
@@ -161,7 +221,7 @@
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success')
+ emit('event_dismantle_success')
resetForm()
getList()
} finally {
@@ -169,7 +229,7 @@
}
}
-// 閬楀け鎿嶄綔
+// 閬楀け.鎷嗘満鎿嶄綔
const loseDismantle = async () => {
// 鏍¢獙琛ㄥ崟
await formRef.value.validate()
@@ -181,7 +241,27 @@
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('success')
+ emit('event_dismantle_success')
+ resetForm()
+ getList()
+ } finally {
+ formLoading.value = false
+ }
+}
+
+// 鎹熸瘉.鎷嗘満鎿嶄綔
+const damageDismantle = async () => {
+ // 鏍¢獙琛ㄥ崟
+ await formRef.value.validate()
+ // 鎻愪氦璇锋眰
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as DevRentVO
+ await DevRentApi.devDamage(data)
+ message.success(t('鎿嶄綔鎴愬姛'))
+ dialogVisible.value = false
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_dismantle_success')
resetForm()
getList()
} finally {
@@ -196,6 +276,11 @@
devId: undefined,
patId: undefined,
patName: undefined,
+ patDeptCode: undefined,
+ patDeptDesc: undefined,
+ patWardCode: undefined,
+ patWardDesc: undefined,
+ patBedNo: undefined,
rentTime: undefined,
returnTime: new Date().getTime(),
interference: undefined,
@@ -205,6 +290,25 @@
category: '',
brand: '',
model: '',
+ devState: undefined,
+ // 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤癸紙PatientInfoBlock 渚濊禆杩欎簺瀛楁锛�
+ // 涓嶅垵濮嬪寲浼氬鑷� Vue 鍦ㄦā鏉夸腑璇诲彇鏈畾涔夊睘鎬у苟鍛婅锛�
+ applyNo: undefined,
+ episodeId: undefined,
+ patGender: undefined,
+ patBirthday: undefined,
+ registerDate: undefined,
+ doctor: undefined,
+ doctorTime: undefined,
+ patSrc: undefined,
+ patMobile: undefined,
+ patPhone: undefined,
+ medicalCard: undefined,
+ outpatientNo: undefined,
+ patIdentityId: undefined,
+ tolerance: undefined,
+ status: undefined,
+ seqNum: undefined,
}
formRef.value?.resetFields()
}
@@ -230,7 +334,7 @@
}
const getRentInfo = async () => {
- const data = await DevRentApi.getDismantleRent(formData.value)
+ const data = await DevRentApi.getExistingRent(formData.value)
if (null === data)
return
@@ -246,7 +350,7 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- jobType: [20, 40],
+ jobType: [20, 40, 42], // 妫�鏌ョ姸鎬�
docId: undefined,
docName: undefined,
devId: undefined,
@@ -275,7 +379,16 @@
}
const getSelectedRent = async (rentId) => {
- formData.value = await DevRentApi.getDevRent(rentId)
+ // 鈿狅笍 鍘熷疄鐜版槸鏁翠綋鏇挎崲 formData锛屼細鎶婃偅鑰呬俊鎭啿鎴� null锛堣瑙� DevReadyPanel 涓悓绫讳慨澶嶇殑璇存槑锛�
+ const _record = await DevRentApi.getDevRent(rentId)
+ if (_record) {
+ const _merged = { ...formData.value } as Record<string, any>
+ Object.keys(_record as Record<string, any>).forEach((k) => {
+ const v = (_record as Record<string, any>)[k]
+ if (v !== null && v !== undefined && v !== '') _merged[k] = v
+ })
+ formData.value = _merged as typeof formData.value
+ }
}
/** 鍒濆鍖� **/
@@ -285,3 +398,16 @@
})
</script>
+
+<style scoped lang="scss">
+/* ==========================================================================
+ 闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
+ Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
+ 鏈〉琛ㄥ崟鍚� 18 椤规偅鑰呬俊鎭紙4 鍒� = 5 琛岋級+ 9 椤硅澶囦俊鎭紝
+ 浠呴棿璺濆氨瑕佷笂鐧� px锛屾妸 el-table 鎸ゅ埌鐪嬩笉瑙併��
+ 杩欓噷缁熶竴鍘嬪埌 4px銆傛敞鎰� :deep 鏄繀闇�鐨勶紙el-form-item 鏄湰缁勪欢鐨勫瓙缁勪欢娓叉煋锛夈��
+ ========================================================================== */
+.patient-compact-form :deep(.el-form-item) {
+ margin-bottom: 4px;
+}
+</style>
--
Gitblit v1.9.3