Fix Bug #505: AI修复

openhis-ui-vue3/src/views/nurse/order/OrderVerify.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import axios from 'axios';
 
@@ -60,80 +60,65 @@ const isReturnBtnDisabled = computed(() => {
   );
 });
 
+const handleTabChange = async (tab) => {
+  loading.value = true;
+  try {
+    const res = await axios.get(`/api/nurse/orders?status=${tab.props.name}`);
+    orderList.value = res.data;
+  } catch (e) {
+    ElMessage.error('加载医嘱列表失败');
+  } finally {
+    loading.value = false;
+  }
+};
+
 const handleSelectionChange = (selection) => {
   selectedOrders.value = selection;
 };
 
 const handleReturn = async () => {
-  if (selectedOrders.value.length === 0) {
-    ElMessage.warning('请至少选择一条医嘱');
-    return;
-  }
-
-  // 二次防御：若前端置灰逻辑被绕过，拦截并提示
-  const hasDispensed = selectedOrders.value.some(
-    (order) => order.dispensing_status === 'DISPENSED'
-  );
-  if (hasDispensed) {
-    ElMessage.error('该药品已由药房发放，请先执行退药处理，不可直接退回');
-    return;
-  }
-
+  if (selectedOrders.value.length === 0) return;
+  
   try {
-    await ElMessageBox.confirm('确认将选中医嘱退回至医生站？', '提示', {
+    await ElMessageBox.confirm('确定要退回选中的医嘱吗？', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
-      type: 'warning',
+      type: 'warning'
     });
-
-    loading.value = true;
-    const orderIds = selectedOrders.value.map((o) => o.id);
-    await axios.post('/api/nurse/order/return', { orderIds });
+    
+    const ids = selectedOrders.value.map(o => o.id);
+    await axios.post('/api/nurse/orders/return', { orderIds: ids });
     ElMessage.success('退回成功');
-    fetchOrders();
+    handleTabChange({ props: { name: activeTab.value } });
   } catch (err) {
-    if (err.response?.data?.message) {
-      ElMessage.error(err.response.data.message);
+    if (err.response && err.response.data) {
+      ElMessage.error(err.response.data.message || err.response.data);
     } else if (err !== 'cancel') {
-      ElMessage.error('退回失败，请重试');
+      ElMessage.error('退回失败');
     }
-  } finally {
-    loading.value = false;
   }
 };
 
-const fetchOrders = async () => {
-  loading.value = true;
-  try {
-    const res = await axios.get('/api/nurse/order/list', {
-      params: { tab: activeTab.value },
-    });
-    orderList.value = res.data.data || [];
-  } catch {
-    ElMessage.error('获取医嘱列表失败');
-  } finally {
-    loading.value = false;
-  }
-};
-
-const handleTabChange = () => fetchOrders();
-
 const getDispensingTagType = (status) => {
-  const map = { PENDING: 'info', DISPENSED: 'success', RETURNED: 'warning' };
-  return map[status] || 'info';
+  switch (status) {
+    case 'DISPENSED': return 'success';
+    case 'PENDING': return 'warning';
+    default: return 'info';
+  }
 };
 
 const formatDispensingStatus = (status) => {
-  const map = { PENDING: '未发药', DISPENSED: '已发药', RETURNED: '已退药' };
-  return map[status] || status;
+  const map = { 'DISPENSED': '已发药', 'PENDING': '待发药', 'RETURNED': '已退药' };
+  return map[status] || status || '未知';
 };
 
-// 初始化加载
-fetchOrders();
+onMounted(() => {
+  handleTabChange({ props: { name: activeTab.value } });
+});
 </script>
 
 <style scoped>
-.order-verify-container { padding: 16px; }
-.header-card { margin-bottom: 16px; }
-.action-bar { margin-top: 16px; display: flex; justify-content: flex-end; }
+.order-verify-container { padding: 20px; }
+.header-card { margin-bottom: 20px; }
+.action-bar { margin-top: 20px; display: flex; justify-content: flex-end; }
 </style>