From b886726eccf3d1ea2ff8e80505106cb224ac5b2d Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Mon, 17 Nov 2025 09:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=B0=B1=E8=AF=8A=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=98=AF=E9=9D=9E=E6=8E=A5=E8=AF=8A=E6=97=B6=EF=BC=8C=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E3=80=90=E9=80=80=E5=8F=B7=E3=80=91=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=98=E8=AF=A5=E6=82=A3=E8=80=85=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=B7=B2=E6=8E=A5=E8=AF=8A=EF=BC=8C=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=80=80=E5=8F=B7=EF=BC=81=E2=80=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charge/outpatientregistration/index.vue   | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 70df43ac..134967e5 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -503,26 +503,22 @@
             </el-table-column>
             <el-table-column label="操作" align="center" key="registerTime" prop="registerTime">
               <template #default="scope">
-                <!-- <el-tooltip
-                  :content="
-                    scope.row.statusEnum == 6
-                      ? '已退号'
-                      : scope.row.statusEnum == 2
-                      ? '已接诊，不允许退号'
-                      : ''
-                  "
+                <el-tooltip
+                  :content="getReturnTooltip(scope.row)"
                   placement="top"
-                  :disabled="scope.row.statusEnum != 6"
-                > -->
-                <el-button
-                  link
-                  type="primary"
-                  @click="handleReturn(scope.row)"
-                  :disabled="scope.row.statusEnum == 6"
+                  :disabled="!getReturnTooltip(scope.row)"
                 >
-                  退号
-                </el-button>
-                <!-- </el-tooltip> -->
+                  <span>
+                    <el-button
+                      link
+                      type="primary"
+                      @click="handleReturn(scope.row)"
+                      :disabled="scope.row.statusEnum != 1"
+                    >
+                      退号
+                    </el-button>
+                  </span>
+                </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
@@ -1202,7 +1198,24 @@ function handleSearchPatient(value) {
   patientSearchKey.value = value;
 }
 
+function getReturnTooltip(row) {
+  if (!row) {
+    return '';
+  }
+  if (row.statusEnum == 6) {
+    return '已退号';
+  }
+  if (row.statusEnum != 1) {
+    return '该患者医生已接诊，不能退号！';
+  }
+  return '';
+}
+
 function handleReturn(row) {
+  if (row.statusEnum != 1) {
+    proxy.$modal.msgError('该患者医生已接诊，不能退号！');
+    return;
+  }
   openRefundDialog.value = true;
   patientInfo.value.patientId = row.patientId;
   patientInfo.value.encounterId = row.encounterId;