From 61749aee4d6e15169c25100195c037016d7b3459 Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Mon, 24 Nov 2025 10:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E5=8F=B7=E7=A0=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD=E7=BB=99=E4=BA=88?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outpatientNoManagement/index.vue          | 51 ++++++++++++++++---
 openhis-ui-vue3/src/views/index.vue           |  6 ++-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/openhis-ui-vue3/src/views/basicmanage/outpatientNoManagement/index.vue b/openhis-ui-vue3/src/views/basicmanage/outpatientNoManagement/index.vue
index 833449e6..36d92185 100644
--- a/openhis-ui-vue3/src/views/basicmanage/outpatientNoManagement/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/outpatientNoManagement/index.vue
@@ -1,6 +1,7 @@
 <template>
-  <!-- Windows XP风格窗口布局，600px固定宽度 -->
-  <div class="outpatient-no-management-wrapper">
+  <div>
+    <!-- Windows XP风格窗口布局，600px固定宽度 -->
+    <div class="outpatient-no-management-wrapper">
     <div class="outpatient-no-management">
       <!--标题栏（32px高） -->
       <div class="title-bar">
@@ -112,10 +113,10 @@
         />
       </div>
     </div>
-  </div>
-  
-  <!-- 编辑弹窗 -->
-  <el-dialog v-model="dialogVisible" :title="dialogTitle" width="600px" append-to-body>
+    </div>
+    
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="600px" append-to-body>
     <el-form label-width="100px">
       <el-form-item label="操作员">
         <el-input v-model="editForm.operatorName" disabled />
@@ -142,7 +143,8 @@
         <el-button type="primary" @click="confirmEdit">确 定</el-button>
       </div>
     </template>
-  </el-dialog>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="outpatientNoManagement">
@@ -238,7 +240,40 @@ function onStartNoChange(row) {
 }
 
 function onClose() {
-  proxy.$tab.closePage()
+  // 检查是否有未保存的数据变动
+  const hasUnsavedChanges = tableData.value.some(row => row._dirty || row._editing)
+  
+  if (hasUnsavedChanges) {
+    // 有未保存的数据，提示用户
+    const message = '窗口数据有变动是否进行保存操作？'
+    
+    if (proxy.$modal?.confirm) {
+      proxy.$modal.confirm(message).then(() => {
+        // 用户选择保存
+        onSave()
+        // 等待保存完成后关闭页面
+        setTimeout(() => {
+          proxy.$tab.closePage()
+        }, 800)
+      }).catch(() => {
+        // 用户选择不保存，直接关闭
+        proxy.$tab.closePage()
+      })
+    } else {
+      // 降级方案：使用原生 confirm
+      if (confirm(message)) {
+        onSave()
+        setTimeout(() => {
+          proxy.$tab.closePage()
+        }, 800)
+      } else {
+        proxy.$tab.closePage()
+      }
+    }
+  } else {
+    // 没有未保存的数据，直接关闭
+    proxy.$tab.closePage()
+  }
 }
 
 function tableRowClassName({ row }) {
diff --git a/openhis-ui-vue3/src/views/index.vue b/openhis-ui-vue3/src/views/index.vue
index 9cb6cd0d..3fd87c1d 100644
--- a/openhis-ui-vue3/src/views/index.vue
+++ b/openhis-ui-vue3/src/views/index.vue
@@ -189,7 +189,7 @@
 </template>
 
 <script setup name="Index">
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, onActivated } from 'vue';
 import { useRouter } from 'vue-router';
 import Chart from 'chart.js/auto';
 import {
@@ -214,6 +214,10 @@ function getExpirationWarningCount() {
 
 let chartInstance = null;
 
+onActivated(() => {
+  getExpirationWarningCount();
+})
+
 onMounted(() => {
   getExpirationWarningCount();