From e25465c223a2e63422acfb58414597ca8fc4df09 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 13 十一月 2025 18:01:55 +0800
Subject: [PATCH] 排队异常、小屏适配问题

---
 src/views/ecg/doctor/components/DevInstallPanel.vue |  354 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 231 insertions(+), 123 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index bc456fc..f0078b0 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -1,5 +1,4 @@
 <template>
-  褰撳墠鎮ｈ��: {{patient?.patId}} {{isStringEmpty(patient?.patName)?'鏃�':patient.patName}}
     <el-form
       ref="formRef"
       :model="formData"
@@ -7,44 +6,69 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="璁惧缂栧彿" prop="devId">
-        <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
+      <el-form-item label="妫�鏌ラ」鐩�" prop="">
+        {{getCheckTypeName(formData.checkType)}}
       </el-form-item>
-      <el-form-item label="璁惧鎻忚堪" prop="">
-        {{deviceInfo.brand + "&nbsp;&nbsp;" + deviceInfo.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="remark">
-        <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+            <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
+<!--        <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />-->
+            <Barcode v-if="displayBarCode" :value="displayBarCode" :width=100 />
+            <el-button @click="copyBarcode()">澶嶅埗</el-button>
+          </el-form-item>
+          <el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
+            <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
+          </el-form-item>
+          <el-form-item label="鎮ｈ�呮弿杩�" prop="patDetails">
+            <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source ||''" />
+            {{formData?.patDetails?.deptDesc}} {{formData?.patDetails?.wardDesc}} {{formData?.patDetails?.bedNo}}
+          </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-col>
+        <el-col :span="12">
+          <el-form-item label="璁惧缂栧彿" prop="devId">
+            <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
+          </el-form-item>
+          <el-form-item label="璁惧鎻忚堪" prop="">
+            {{devInfo?.brand || '-'}} {{devInfo?.model || '-' }} {{tranlateDevState(devInfo?.state)}}
+          </el-form-item>
+          <el-form-item label="澶囨敞" prop="remark">
+            <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+          </el-form-item>
+           <el-form-item label="鏄惁澶氳��" prop="tolerance">
+          <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+        <el-tag type="danger" v-else>鏄�</el-tag>
+        </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
+    <el-button @click="submitForm" type="primary" :disabled="formLoading">瑁呮満瀹屾垚</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" @row-click="onRowClick" >
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
+      <el-table-column label="瑁呮満鎯呭喌" align="center" prop="lost" >
         <template #default="scope">
-          <span v-if="scope.row.jobType === 5">"宸查鐢�"</span>
-          <span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span>
+          <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span>
+          <span v-if="scope.row.jobType === 35">"宸叉斁寮�"</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="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="浣滀笟鏃堕棿"
@@ -53,18 +77,16 @@
           :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">
+<!--      <el-table-column label="鎿嶄綔" align="center" min-width="120px">
         <template #default="scope">
           <el-button
               link
@@ -83,8 +105,7 @@
             鍒犻櫎
           </el-button>
         </template>
-      </el-table-column>
--->
+      </el-table-column>-->
     </el-table>
     <!-- 鍒嗛〉 -->
     <Pagination
@@ -98,62 +119,82 @@
 </template>
 
 <script setup lang="ts">
-import {defineComponent, PropType} from "vue";
 import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
-import {QueueVO} from "@/api/ecg/queue";
-import {isStringEmpty} from "@/utils/stringUtil";
-import {dateFormatter, timeFormatter} from "@/utils/formatTime";
+import {dateFormatter} from "@/utils/formatTime";
 import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
-import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
+import {isStringEmpty} from "@/utils/stringUtil";
 import {curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {DeviceApi, DeviceVO} from "@/api/ecg/devmanage";
+import {QueueVO} from "@/api/ecg/queue";
+import {RoomBedVO} from "@/api/ecg/doctor";
+import {Barcode} from "@/components/Barcode";
+import {useCheckTypeStore} from "@/store/modules/checkType";
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {tranlateDevState} from "../../../../utils/statusFormatter";
+import {getCheckTypeName} from "../../../../utils/checkTypeFormatter";
 
-/** 瑁呮満鎷嗘満 琛ㄥ崟 */
+/** 璁惧瑁呮満 琛ㄥ崟 */
 defineComponent({ name: 'DevInstallPanel' })
 
-const emit = defineEmits(['success-ready']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+const  props = defineProps({
+  room: {
+    type: Object as PropType<RoomBedVO>,
+    required: true
+  }
+})
 
 const { t } = useI18n() // 鍥介檯鍖�
 const message = useMessage() // 娑堟伅寮圭獥
 
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
+const formRef = ref() // 琛ㄥ崟 Ref
+
+const displayBarCode = ref<string> ()
 
 const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
 
-const patient = ref<QueueVO>({
+const formData = ref<Partial<DevRentVO>>({
+  applyNo: undefined,
+  episodeId: undefined,
   patId: '',
-  patName: ''
+  patName: '',
+  rentTime: new Date().getTime(),
+  devId: '',
+  remark: '',
+  checkType: undefined,
 })
 
-const formData = ref({
-  id: undefined,
-  devId: undefined,
-  patId: patient.value?.patId,
-  patName: patient.value?.patName,
-  rentTime: new Date().getTime(),
-  returnTime: undefined,
-  interference: undefined,
-  baseline: undefined,
-  detachment: undefined,
-  remark: undefined
+const devInfo = ref<Partial<DeviceVO>>({
+  category: undefined,
+  brand: undefined,
+  model: undefined,
+  state: undefined,
 })
+
 const formRules = reactive({
   devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
   rentTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
-  patId: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }],
-  patName: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }]
+  patId: [{ required: true, message: '鎮ｈ�呬笉鑳戒负绌�', trigger: 'blur' }],
+  patName: [{ required: true, message: '鎮ｈ�呭悕涓嶈兘涓虹┖', trigger: 'blur' }]
 })
-const formRef = ref() // 琛ㄥ崟 Ref
 
-const deviceInfo = ref<DeviceVO> ({
-  id: 0,
-  devId: '',
-  category: '',
-  brand: '',
-  model: '',
-  purchaseDate: 0,
-  lost: 0,
-})
+
+const emit = defineEmits(['event_dev_install']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
+
+const checkTypeStore = useCheckTypeStore()
+
+const setPatient = (queueVO: QueueVO | undefined | null) => {
+  console.log("setPatient...", queueVO)
+  resetForm()
+  formData.value.applyNo = queueVO?.applyNo
+  formData.value.episodeId = queueVO?.episodeId
+  formData.value.patId = queueVO?.patId
+  formData.value.patName = queueVO?.patName
+  formData.value.checkType = queueVO?.bookCheckType
+  getReadyRentInfo(formData.value)    // 鑾峰彇棰嗙敤淇℃伅
+  copyBarcode()
+}
+defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
+
 
 /** 鎻愪氦琛ㄥ崟 */
 const submitForm = async () => {
@@ -162,39 +203,23 @@
   // 鎻愪氦璇锋眰
   formLoading.value = true
   try {
+    if (null == formData.value)
+      return
+
+    formData.value.roomId = props.room.roomId
+    formData.value.bedNo = props.room.bedNo
     const data = formData.value as unknown as DevRentVO
-    if (formData.value.id === null || formData.value.id === undefined) {
-      const result = await DevRentApi.devReady(data)
-      formData.value.id = result
-      message.success(t('鎿嶄綔瀹屾垚'))
-    } else {
-      await DevRentApi.devReady(data)
-      message.success(t('鏇存柊瀹屾垚'))
-    }
-    dialogVisible.value = false
-    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
-    emit('success-ready')
+    await DevRentApi.devInstall(data)
+
     resetForm()
     getList()
+
+    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+    emit('event_dev_install')
+    message.success(t('鎿嶄綔鎴愬姛'))
   } 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-ready')
-  resetForm()
-  getList()
 }
 
 /** 閲嶇疆琛ㄥ崟 */
@@ -202,28 +227,75 @@
   formData.value = {
     id: undefined,
     devId: undefined,
-    patId: patient.value?.patId,
-    patName: patient.value?.patName,
+    patId: undefined,
+    patName: undefined,
     rentTime: new Date().getTime(),
     returnTime: undefined,
     interference: undefined,
     baseline: undefined,
     detachment: undefined,
-    remark: undefined
+    remark: undefined,
+    checkType: undefined,
   }
   formRef.value?.resetFields()
-
-  deviceInfo.value.category = ''
-  deviceInfo.value.brand = ''
-  deviceInfo.value.model = ''
+  devInfo.value = {
+    category: undefined,
+    brand: undefined,
+    model: undefined,
+    state: undefined,
+  }
 }
 
-const setPatient = (queueVO: QueueVO | undefined) => {
-  patient.value = queueVO
+const getDevInfo = async () => {
+  if (formData.value?.devId == null) {
+    devInfo.value.brand = undefined
+    devInfo.value.model = undefined
+    devInfo.value.state = undefined
+    return
+  }
+
+  const data = await DeviceApi.getDeviceByDevId(formData.value?.devId)
+  if ( null !== data)
+    devInfo.value = data
+}
+
+const getRentInfoByPatId = () => {
+  if (null == formData.value?.patId)
+    return;
+
+  const tempPatId = formData.value?.patId;
   resetForm()
-}
-defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
+  if (isStringEmpty(tempPatId))
+    return
 
+  formData.value.patId = tempPatId;
+  getReadyRentInfo(formData.value)
+  copyBarcode()
+}
+
+// 鑾峰彇鎮ｈ�呯殑棰嗙敤淇℃伅
+const getReadyRentInfo = async (devRentVO) => {
+  if ((devRentVO.devId == null || devRentVO.devId === '') && (devRentVO.patId == null || devRentVO.patId === '') )
+    return
+
+  const data = await DevRentApi.getReadyRent(devRentVO)
+  if ( data == null)
+    return
+
+  formData.value = data  //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿瑁呮満鏃堕棿琚竻绌�
+  if (formData.value == null)
+    return
+
+  // 榛樿瑁呮満鏃堕棿 閲囩敤褰撳墠鏃ユ湡
+  formData.value.rentTime = new Date().getTime()
+
+  // 璁╁尰鐢熸墜鍔ㄨ緭鍏ワ紝閬垮厤鍑洪敊
+  formData.value.devId = ''
+  devInfo.value.category = undefined
+  devInfo.value.brand = undefined
+  devInfo.value.model = undefined
+  devInfo.value.state = undefined
+}
 
 const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
 const list = ref<JobRecordVO[]>([]) // 鍒楄〃鐨勬暟鎹�
@@ -231,7 +303,7 @@
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  jobType: [5, 30],
+  jobType: [10, 35],
   docId: undefined,
   docName: undefined,
   devId: undefined,
@@ -242,7 +314,6 @@
   remark: undefined,
   createTime: []
 })
-
 /** 鏌ヨ鍒楄〃 */
 const getList = async () => {
   loading.value = true
@@ -261,34 +332,71 @@
 }
 
 const getSelectedRent = async (rentId) => {
-  formData.value = await DevRentApi.getDevRent(rentId)
+  const data = await DevRentApi.getDevRent(rentId)
+
+  formData.value = data
+
+  devInfo.value.category = data.category
+  devInfo.value.brand = data.brand
+  devInfo.value.model = data.model
+  devInfo.value.state = data.devState
 }
 
-const printBill = async () => {
-  ElNotification({
-    title: '娓╅Θ鎻愮ず',
-    message: '寰呭疄鐜帮紒',
-    type: 'warning'
-  })
+const cancelInstall = async () => {
+  formData.value.roomId = props.room.roomId
+  formData.value.bedNo = props.room.bedNo
+  const data = formData.value as unknown as DevRentVO
+  if (formData.value.id === null || formData.value.id === undefined) {
+    const result = await DevRentApi.devInstallCancel(data)
+    formData.value.id = result
+    message.success(t('鎿嶄綔鎴愬姛'))
+  } else {
+    await DevRentApi.devInstallCancel(data)
+    message.success(t('鎿嶄綔鎴愬姛'))
+  }
+  // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+  emit('event_dev_install')
+  resetForm()
+  getList()
 }
 
-const getDevInfo = async () => {
-  deviceInfo.value.category = ''
-  deviceInfo.value.brand = ''
-  deviceInfo.value.model = ''
-  if (isStringEmpty(formData.value.devId))
-    return
+const getDisplayBarcode = (): string => {
+  if (!formData.value.checkType)
+    return ""
 
-  const data = await DeviceApi.getDeviceByDevId(formData.value.devId!)
-  console.info( data )
-  if ( null !== data)
-    deviceInfo.value = data
+  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
+  if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
+      !displayBarcode.includes( formData.value.patDetails.source ))
+    return ""
+
+  return getBarcode()
+}
+
+const getBarcode = (): string => {
+  if (!formData.value.checkType)
+    return ""
+
+  const patSource = formData.value.patDetails?.source
+  if (patSource == null)
+    return ""
+
+  if (1 === patSource || 2 === patSource)
+    return formData.value.applyNo??""
+  else if (3 === patSource || 4 === patSource)
+    return formData.value.episodeId??""
+
+  return ""
+}
+
+const copyBarcode = async () => {
+  displayBarCode.value = getDisplayBarcode()
+  await navigator.clipboard.writeText( getBarcode() );
 }
 
 /** 鍒濆鍖� **/
 onMounted(() => {
+  resetForm()
   getList()
 })
 
 </script>
-

--
Gitblit v1.9.3