From cdc47651d6aa723754f3609148b28a35220138bb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 14 九月 2026 23:49:43 +0800
Subject: [PATCH] 允许诊室有人也可以选择

---
 src/assets/room/desk-doctor.jpg                    |    0 
 src/views/ecg/doctor/components/RoutinePanel.vue   |  146 ++++++++++++----------------
 src/assets/room/close.jpg                          |    0 
 src/views/ecg/room/RoomLoginSelect.vue             |   38 +++++--
 src/components/RoomBedSelect/src/RoomBedSelect.vue |   59 ++++-------
 src/assets/room/open.jpg                           |    0 
 src/assets/room/doctor.png                         |    0 
 7 files changed, 112 insertions(+), 131 deletions(-)

diff --git a/src/assets/room/close.jpg b/src/assets/room/close.jpg
index bca3b30..ca77e1a 100644
--- a/src/assets/room/close.jpg
+++ b/src/assets/room/close.jpg
Binary files differ
diff --git a/src/assets/room/desk-doctor.jpg b/src/assets/room/desk-doctor.jpg
new file mode 100644
index 0000000..858b336
--- /dev/null
+++ b/src/assets/room/desk-doctor.jpg
Binary files differ
diff --git a/src/assets/room/doctor.png b/src/assets/room/doctor.png
index 9e44274..38d4fe7 100644
--- a/src/assets/room/doctor.png
+++ b/src/assets/room/doctor.png
Binary files differ
diff --git a/src/assets/room/open.jpg b/src/assets/room/open.jpg
index f480397..a1c7c37 100644
--- a/src/assets/room/open.jpg
+++ b/src/assets/room/open.jpg
Binary files differ
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index 43d48e8..174ba64 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { RoomVO } from '@/api/ecg/room'
-import {PropType} from "vue";
-import {useCheckTypeStore} from "@/store/modules/checkType";
-import {UserVO} from "@/store/modules/user";
-import {getCheckTypeName} from "../../../utils/checkTypeFormatter";
+import { PropType } from "vue";
+import { useCheckTypeStore } from "@/store/modules/checkType";
+import { UserVO } from "@/store/modules/user";
+import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
 
 const emit = defineEmits(['event-haveseat', 'event-leaveseat', 'event-setcurseat'])
 
@@ -11,8 +11,8 @@
   name: 'RoomBedSelect'
 })
 
-const  props = defineProps({
-// defineProps({
+const props = defineProps({
+  // defineProps({
   title: {
     type: Number,
     required: true
@@ -45,53 +45,43 @@
 
 /** 鍒濆鍖� **/
 onMounted(() => {
-    console.info(props.bedList)
+  console.info(props.bedList)
 })
 
 </script>
 
 <template>
-  <el-card style="width: 200px" shadow="hover" >
-    <template #header>{{bedList[0].roomName}}</template>
+  <el-card style="width: 200px" shadow="hover">
+    <template #header>{{ bedList[0].roomName }}</template>
     <div v-for="(bedItem, index) in bedList" :key="index">
       <div class="deskwarp">
 
         <div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
-          {{getCheckTypeName(checkType)}}
+          {{ getCheckTypeName(checkType) }}
         </div>
         <div>
-          {{bedItem.opType === 1?"棰嗙敤":""}}
-          {{bedItem.opType === 2?"瀹夎":""}}
+          {{ bedItem.opType === 1 ? "棰嗙敤" : "" }}
+          {{ bedItem.opType === 2 ? "瀹夎" : "" }}
         </div>
 
-        <img
-            v-if="bedItem.docId === null"
-            src="@/assets/room/open.jpg"
-            style="width: 100%"
-            alt="鏃犲尰鐢�"
-        />
-        <img
-            v-else
-            src="@/assets/room/desk-doctor.jpeg"
-            style="width: 100%"
-            alt="鏈夊尰鐢�"
-        />
-        <div>{{bedItem.bedNo}} {{bedItem.docName}} {{bedItem.status === 30?"-鏆傚仠":""}}</div>
-        <el-button v-if="bedItem.docId === null" @click = onHaveSeatclick(bedItem)>
-           鍏ュ骇
+        <img v-if="bedItem.docId === null" src="@/assets/room/open.jpg" style="width: 100%" alt="鏃犲尰鐢�" />
+        <img v-else src="@/assets/room/desk-doctor.jpg" style="width: 100%" alt="鏈夊尰鐢�" />
+        <div>{{ bedItem.bedNo }} {{ bedItem.docName }} {{ bedItem.status === 30 ? "-鏆傚仠" : "" }}</div>
+        <el-button v-if="bedItem.docId == null || bedItem.docId != curUser.id" @click="onHaveSeatclick(bedItem)">
+          鍏ュ骇
         </el-button>
         <div v-if="bedItem.docId === curUser.id">
-          <el-button @click = onLeaveSeatclick(bedItem)>
-             绂诲骇
+          <el-button @click=onLeaveSeatclick(bedItem)>
+            绂诲骇
           </el-button>
-          <span v-if="bedItem.roomId === curBed.roomId && bedItem.bedNo === curBed.bedNo" >
-             褰撳墠
+          <span v-if="bedItem.roomId === curBed.roomId && bedItem.bedNo === curBed.bedNo">
+            褰撳墠
           </span>
-          <el-button v-else @click = onSetCurSeatclick(bedItem)>
-             璁句负褰撳墠
+          <el-button v-else @click=onSetCurSeatclick(bedItem)>
+            璁句负褰撳墠
           </el-button>
         </div>
-        <el-divider/>
+        <el-divider />
       </div>
     </div>
   </el-card>
@@ -123,5 +113,4 @@
   align-items: center;
   /*height: 260px;*/
 }
-
 </style>
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index ad7f9fd..a9ceea2 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -1,55 +1,67 @@
 <!-- 甯歌妫�鏌� 鍖荤敓鐣岄潰-->
 <template>
-  <el-form
-    ref="formRef"
-    :model="formData"
-    :rules="formRules"
-    label-width="100px"
-    v-loading="formLoading"
-  >
-    <el-row :gutter="20">
-      <el-col :span="12">
+  <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+    <el-row :gutter="20">      
+      <el-col :span="6">
         <el-form-item label="鎮h�呯紪鍙�" 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 />-->
+          <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="鎮h�呭悕绉�" prop="patName">
-          <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
-        </el-form-item>
-        <el-form-item label="鎮h�呮弿杩�" prop="patDetails">
-          <dict-tag
-            v-if="formData.patDetails?.source"
-            :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-col :span="6">
+          <el-form-item label="鎮h�呭悕绉�" prop="patName">
+            <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
+          </el-form-item>
+        </el-col>
+      <el-col :span="6">
+        <el-form-item label="灏辫瘖缂栧彿" prop="episodeId">
+          <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭氨璇婄紪鍙�" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="鑱旂郴鐢佃瘽" prop="episodeId">
+          {{ formData?.patDetails?.mobile }}
+        </el-form-item>
+      </el-col>      
+    </el-row>
+    <el-row>
+      <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="18">
+        <el-form-item label="绉戝鐥呭尯" prop="patDetails">
+          <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE"
+            :value="formData.patDetails?.source" />
+          {{ formData?.patDetails?.deptDesc }}-{{ formData?.patDetails?.wardDesc }}-{{ formData?.patDetails?.bedNo }}
+        </el-form-item></el-col>
+
+    </el-row>
+    <el-row>
+      <el-col :span="6">
+        <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="6">
         <el-form-item label="妫�鏌ラ」鐩�" prop="">
           {{ formData?.checkType && getCheckTypeName(formData?.checkType) }}
         </el-form-item>
-        <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
-        </el-form-item>
+      </el-col>
+      <el-col :span="6">
         <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-col :span="6">
+        <el-form-item label="澶囨敞" prop="remark">
+          <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -57,32 +69,14 @@
   <el-button @click="submitForm" type="primary" :disabled="formLoading">妫�鏌ュ畬鎴�</el-button>
   <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純妫�鏌�</el-button>
   <el-button @click="resetForm()">閲� 缃�</el-button>
-  <el-button @click="yddownload()" :loading="yddownloadLoading"
-    :disabled="yddownloadLoading">骞虫澘杩愬姩蹇冪數鍥剧煡鎯呭悓鎰忎功</el-button>
-  <el-button @click="sgdownload()" :loading="sgdownloadLoading"
-    :disabled="sgdownloadLoading">椋熺蹇冭剰鐢电敓鐞嗚瘖鐤楃煡鎯呭悓鎰忎功</el-button>
-  <el-button
-    v-if="needAutoFeeConfirm(formData.checkType)"
-    @click="feeConfirm"
-    :disabled="formLoading"
-    >纭垂</el-button
-  >
-  <el-button
-    v-if="needAutoFeeConfirm(formData.checkType)"
-    @click="feeCancel"
-    :disabled="formLoading"
-    >鍙栨秷纭垂</el-button
-  >
+  <el-button @click="yddownload()" :loading="yddownloadLoading" :disabled="yddownloadLoading">骞虫澘杩愬姩蹇冪數鍥剧煡鎯呭悓鎰忎功</el-button>
+  <el-button @click="sgdownload()" :loading="sgdownloadLoading" :disabled="sgdownloadLoading">椋熺蹇冭剰鐢电敓鐞嗚瘖鐤楃煡鎯呭悓鎰忎功</el-button>
+  <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
+  <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
 
   <!-- 鍖荤敓瑁呮満鍒楄〃 -->
   <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      @row-click="onRowClick"
-    >
+    <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="lost">
         <template #default="scope">
@@ -96,22 +90,10 @@
       <!--      <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />-->
       <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
       <el-table-column label="鎮h�呭悕绉�" align="center" prop="patName" />
-      <el-table-column
-        label="浣滀笟鏃堕棿"
-        align="center"
-        prop="jobTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <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" prop="createTime" :formatter="dateFormatter" width="180px" />
       <!--
       <el-table-column label="鎿嶄綔" align="center" min-width="120px">
         <template #default="scope">
@@ -136,12 +118,8 @@
 -->
     </el-table>
     <!-- 鍒嗛〉 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 </template>
 
@@ -274,7 +252,7 @@
     message.warning('褰撳墠鏃犲氨璇婁腑鎮h�呰鍏堝彨鍙�')
     return
   }
-  
+
   yddownloadLoading.value = true
   try {
     const response = await DoctorApi.yddownload(props.setappointmentId)
@@ -292,7 +270,7 @@
     message.warning('褰撳墠鏃犲氨璇婁腑鎮h�呰鍏堝彨鍙�')
     return
   }
-  
+
   sgdownloadLoading.value = true
   try {
     const response = await DoctorApi.sgdownload(props.setappointmentId)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 2acaac3..0602391 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -213,18 +213,32 @@
 }
 
 const haveSeat = async (newRoomVO: RoomVO) => {
-  ElMessageBox.confirm(
-      '鍏ュ骇, 鏄惁缁х画?',
-      '鎻愮ず',
-      {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }
-  ).then(async () => {
-    haveSeatConfirm(newRoomVO)
-  }).catch(() => {
-  });
+  // 1. 鎻愬彇涓嶅悓鐨勬彁绀鸿
+  const message = newRoomVO.docId != null
+    ? '宸茬粡鏈変汉浜�, 鏄惁纭畾瑕佺户缁叆搴�?'
+    : '鍏ュ骇, 鏄惁缁х画?';
+
+  try {
+    // 2. 绛夊緟鐢ㄦ埛鐐瑰嚮纭
+    await ElMessageBox.confirm(message, '鎻愮ず', {
+      confirmButtonText: '纭畾',
+      cancelButtonText: '鍙栨秷',
+      type: 'warning'
+    });
+
+    if (newRoomVO.docId != null) {
+      await leaveSeatConfirm(newRoomVO);
+    }
+
+    // 4. 绂诲骇鎴愬姛锛堟垨鍘熸湰灏辨病浜猴級锛屾渶鍚庢墽琛屽叆搴�
+    await haveSeatConfirm(newRoomVO);
+
+  } catch (err) {
+    // 鍙湁鐢ㄦ埛涓诲姩鐐瑰嚮鍙栨秷鏃舵墠蹇界暐锛屽叾浠栨姤閿欏彲浠ユ墦鍗板嚭鏉ユ柟渚挎帓鏌�
+    if (err !== 'cancel') {
+      console.error('鍏ュ骇娴佺▼寮傚父:', err);
+    }
+  }
 }
 
 const leaveSeat = (roomVO: RoomVO) => {

--
Gitblit v1.9.3