Fix Bug #505: AI修复

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

@@ -3,77 +3,110 @@
     <el-card>
       <template #header>
         <div class="card-header">
-          <span>医嘱校对</span>
-          <el-button type="primary" :disabled="isReturnDisabled" @click="handleReturn">退回</el-button>
+          <span>医嘱校对 - 已校对</span>
         </div>
       </template>
 
-      <el-tabs v-model="activeTab">
-        <el-tab-pane label="已校对" name="verified">
-          <el-table
-            :data="tableData"
-            @selection-change="handleSelectionChange"
-            style="width: 100%"
-          >
-            <el-table-column type="selection" width="55" />
-            <el-table-column prop="orderName" label="医嘱名称" />
-            <el-table-column prop="executeStatus" label="执行状态" />
-            <el-table-column prop="dispenseStatus" label="发药状态" />
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
+      <el-table
+        :data="orderList"
+        @selection-change="handleSelectionChange"
+        v-loading="loading"
+        border
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="orderNo" label="医嘱号" width="120" />
+        <el-table-column prop="itemName" label="药品名称" />
+        <el-table-column prop="executeStatus" label="执行状态" width="100">
+          <template #default="{ row }">
+            <el-tag :type="row.executeStatus === 1 ? 'success' : 'info'">
+              {{ row.executeStatus === 1 ? '已执行' : '未执行' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="dispenseStatus" label="发药状态" width="100">
+          <template #default="{ row }">
+            <el-tag :type="row.dispenseStatus === 1 ? 'warning' : 'info'">
+              {{ row.dispenseStatus === 1 ? '已发药' : '未发药' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="toolbar mt-4">
+        <!-- Bug #505 修复：动态绑定 disabled，阻断已发药/已执行医嘱的退回操作 -->
+        <el-button
+          type="warning"
+          :disabled="isReturnDisabled"
+          @click="handleReturn"
+        >
+          退回
+        </el-button>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { returnOrderApi } from '@/api/inpatient/order';
+import { getVerifiedOrders, returnOrdersApi } from '@/api/inpatient/order';
 
-const activeTab = ref('verified');
-const tableData = ref([]);
-const selectedRows = ref([]);
+const loading = ref(false);
+const orderList = ref([]);
+const selectedOrders = ref([]);
 
-// 核心交互约束：已发药或已执行状态下，退回按钮置灰
-const isReturnDisabled = computed(() => {
-  if (selectedRows.value.length === 0) return true;
-  return selectedRows.value.some(row =>
-    row.dispenseStatus === 'DISPENSED' || row.executeStatus === 'EXECUTED'
-  );
+onMounted(async () => {
+  loading.value = true;
+  try {
+    const res = await getVerifiedOrders();
+    orderList.value = res.data || [];
+  } finally {
+    loading.value = false;
+  }
 });
 
-const handleSelectionChange = (rows) => {
-  selectedRows.value = rows;
+const handleSelectionChange = (selection) => {
+  selectedOrders.value = selection;
 };
 
+// Bug #505 修复：计算属性控制按钮可用性
+// 规则：未选中、或任意选中项为已发药/已执行时，按钮置灰
+const isReturnDisabled = computed(() => {
+  if (selectedOrders.value.length === 0) return true;
+  return selectedOrders.value.some(
+    (order) => order.dispenseStatus === 1 || order.executeStatus === 1
+  );
+});
+
 const handleReturn = async () => {
   if (isReturnDisabled.value) return;
 
   try {
-    await ElMessageBox.confirm('确认退回选中医嘱？', '提示', { type: 'warning' });
-    
-    const ids = selectedRows.value.map(r => r.id);
-    const res = await returnOrderApi(ids);
-    
-    if (res.code === 0) {
-      ElMessage.success('退回成功');
-      // 刷新列表逻辑略
-    } else {
-      ElMessage.error(res.msg);
-    }
-  } catch (err) {
-    if (err !== 'cancel') {
-      ElMessage.error('操作失败');
+    await ElMessageBox.confirm('确认将选中医嘱退回至医生站？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    const ids = selectedOrders.value.map((o) => o.id);
+    await returnOrdersApi(ids);
+    ElMessage.success('退回成功');
+    // 刷新列表
+    const res = await getVerifiedOrders();
+    orderList.value = res.data || [];
+    selectedOrders.value = [];
+  } catch (error) {
+    if (error !== 'cancel') {
+      // 捕获后端抛出的 IllegalStateException 并展示
+      ElMessage.error(error.message || '退回失败');
     }
   }
 };
 </script>
 
 <style scoped>
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
+.order-verify-container { padding: 20px; }
+.card-header { display: flex; justify-content: space-between; align-items: center; }
+.toolbar { display: flex; justify-content: flex-end; }
+.mt-4 { margin-top: 16px; }
 </style>