diff --git a/openhis-ui-vue3/src/views/inpatient/doctorstation/components/SurgeryApplyHistory.vue b/openhis-ui-vue3/src/views/inpatient/doctorstation/components/SurgeryApplyHistory.vue
index c55268016..51beed3b4 100644
--- a/openhis-ui-vue3/src/views/inpatient/doctorstation/components/SurgeryApplyHistory.vue
+++ b/openhis-ui-vue3/src/views/inpatient/doctorstation/components/SurgeryApplyHistory.vue
@@ -54,15 +54,27 @@
           <el-tag :type="getStatusType(row.status)" effect="light">{{ getStatusText(row.status) }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150" fixed="right" align="center">
-        <template #default="scope">
-          <el-button link type="primary" @click="handleView(scope.row)">查看</el-button>
-          <el-button v-if="scope.row.status === 1" link type="warning" @click="handleSign(scope.row)">签发</el-button>
-          <el-button v-if="scope.row.status === 1" link type="danger" @click="handleRevoke(scope.row)">撤销</el-button>
+      <el-table-column label="操作" width="220" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-button link type="primary" @click="handleView(row)">详情</el-button>
+          <!-- 待签发 (1) -->
+          <template v-if="row.status === 1">
+            <el-button link type="primary" @click="handleEdit(row)">编辑</el-button>
+            <el-button link type="danger" @click="handleDelete(row)">删除</el-button>
+          </template>
+          <!-- 已签发 (2) -->
+          <template v-else-if="row.status === 2">
+            <el-button link type="warning" @click="handleRevoke(row)">撤回</el-button>
+          </template>
+          <!-- 已校对/已执行/已安排/已完成 (3,4,5,6) -->
+          <template v-else-if="[3, 4, 5, 6].includes(row.status)">
+            <el-button link type="info" @click="handlePrint(row)">打印</el-button>
+          </template>
         </template>
       </el-table-column>
     </el-table>
-    
+
+    <!-- 分页 -->
     <el-pagination
       v-model:current-page="queryParams.pageNum"
       v-model:page-size="queryParams.pageSize"
@@ -73,85 +85,135 @@
       @current-change="handleQuery"
       style="margin-top: 15px; justify-content: flex-end;"
     />
+
+    <!-- 编辑弹窗 (复用临床医嘱-手术界面) -->
+    <el-dialog v-model="editDialogVisible" title="编辑手术申请单" width="800px" destroy-on-close>
+      <AdviceForm ref="editFormRef" :is-edit="true" :initial-data="currentEditData" @confirm="onEditConfirm" @cancel="editDialogVisible = false" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { ElMessage, ElMessageBox } from 'element-plus';
-// import { getSurgeryApplyList, signSurgeryApply, revokeSurgeryApply } from '@/api/doctorstation'; // 假设API路径
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AdviceForm from './AdviceForm.vue'
+// 假设 API 模块路径，实际项目请根据路由调整
+import { getSurgeryApplyList, deleteSurgeryApply, revokeSurgeryApply, printSurgeryApply, updateSurgeryApply } from '@/api/surgery'
 
-const loading = ref(false);
-const tableData = ref([]);
-const total = ref(0);
+const loading = ref(false)
+const tableData = ref([])
+const total = ref(0)
+const editDialogVisible = ref(false)
+const currentEditData = ref({})
+const editFormRef = ref(null)
 
 const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
   dateRange: [],
   status: '',
-  keyword: '',
-  pageNum: 1,
-  pageSize: 10
-});
+  keyword: ''
+})
 
 const dateShortcuts = [
-  { text: '最近一周', value: () => { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); return [start, end]; } },
-  { text: '最近一个月', value: () => { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); return [start, end]; } }
-];
-
-// 状态映射逻辑 (严格对应需求)
-const getStatusType = (status) => {
-  const map = { 1: 'info', 2: 'primary', 3: 'primary', 4: 'primary', 5: 'warning', 6: 'success', 10: 'danger' };
-  return map[status] || 'info';
-};
+  { text: '最近一周', value: () => { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); return [start, end] } },
+  { text: '最近一个月', value: () => { const end = new Date(); const start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); return [start, end] } }
+]
 
 const getStatusText = (status) => {
-  const map = { 1: '待签发', 2: '已签发', 3: '已校对', 4: '已执行', 5: '已安排', 6: '已完成', 10: '已撤销' };
-  return map[status] || '未知';
-};
+  const map = { 1: '待签发', 2: '已签发', 3: '已校对', 4: '已执行', 5: '已安排', 6: '已完成', 10: '已撤销' }
+  return map[status] || '未知'
+}
 
-const handleQuery = () => {
-  loading.value = true;
-  // 模拟API调用替换为实际接口
-  setTimeout(() => {
-    // tableData.value = res.data.list;
-    // total.value = res.data.total;
-    loading.value = false;
-  }, 300);
-};
+const getStatusType = (status) => {
+  const map = { 1: 'info', 2: 'primary', 3: 'success', 4: 'success', 5: 'warning', 6: 'success', 10: 'danger' }
+  return map[status] || 'info'
+}
+
+const handleQuery = async () => {
+  loading.value = true
+  try {
+    const res = await getSurgeryApplyList(queryParams)
+    tableData.value = res.data.list || []
+    total.value = res.data.total || 0
+  } catch (e) {
+    ElMessage.error('查询失败')
+  } finally {
+    loading.value = false
+  }
+}
 
 const handleReset = () => {
-  queryParams.dateRange = [];
-  queryParams.status = '';
-  queryParams.keyword = '';
-  queryParams.pageNum = 1;
-  handleQuery();
-};
+  queryParams.dateRange = []
+  queryParams.status = ''
+  queryParams.keyword = ''
+  queryParams.pageNum = 1
+  handleQuery()
+}
 
 const handleView = (row) => {
-  ElMessage.info(`查看手术单: ${row.applyNo}`);
-};
+  // 打开详情弹窗或路由跳转
+  ElMessage.info(`查看手术申请单详情: ${row.applyNo}`)
+}
 
-const handleSign = async (row) => {
+const handleEdit = (row) => {
+  currentEditData.value = { ...row }
+  editDialogVisible.value = true
+}
+
+const onEditConfirm = async (formData) => {
   try {
-    await ElMessageBox.confirm('确认签发该手术申请？签发后将流转至护士站。', '提示', { type: 'warning' });
-    // await signSurgeryApply(row.id);
-    ElMessage.success('签发成功');
-    handleQuery();
-  } catch {}
-};
+    await updateSurgeryApply(formData)
+    ElMessage.success('修改成功')
+    editDialogVisible.value = false
+    handleQuery()
+  } catch (e) {
+    ElMessage.error('修改失败')
+  }
+}
+
+const handleDelete = async (row) => {
+  try {
+    await ElMessageBox.confirm('确认删除该笔手术申请单吗？删除后数据还原将无法恢复。', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      confirmButtonClass: 'el-button--danger',
+      type: 'warning'
+    })
+    await deleteSurgeryApply(row.id)
+    ElMessage.success('删除成功，状态已更新为已作废')
+    handleQuery()
+  } catch (e) {
+    if (e !== 'cancel') ElMessage.error('删除失败')
+  }
+}
 
 const handleRevoke = async (row) => {
   try {
-    await ElMessageBox.confirm('确认撤销该手术申请？撤销后将无法恢复。', '警告', { type: 'error' });
-    // await revokeSurgeryApply(row.id);
-    ElMessage.success('撤销成功');
-    handleQuery();
-  } catch {}
-};
+    await ElMessageBox.confirm('确认撤回该手术申请吗？', '提示', { type: 'warning' })
+    const res = await revokeSurgeryApply(row.id)
+    if (res.code === 200) {
+      ElMessage.success('撤回成功，单据已回滚至待签发状态')
+      handleQuery()
+    } else {
+      ElMessage.error(res.msg || '撤回失败！该手术申请已由病区护士已校对，请致电病区护士处理。')
+    }
+  } catch (e) {
+    if (e !== 'cancel') {
+      const errMsg = e.response?.data?.msg || e.message || '撤回失败！该手术申请已由病区护士已校对，请致电病区护士处理。'
+      ElMessage.error(errMsg)
+    }
+  }
+}
+
+const handlePrint = (row) => {
+  ElMessage.success('正在调用打印服务...')
+  printSurgeryApply(row.id)
+}
 
 onMounted(() => {
-  handleQuery();
-});
+  handleQuery()
+})
 </script>
 
 <style scoped>
diff --git a/tests/e2e/specs/bug-regression.spec.ts b/tests/e2e/specs/bug-regression.spec.ts
index a1957557c..e87a39864 100644
--- a/tests/e2e/specs/bug-regression.spec.ts
+++ b/tests/e2e/specs/bug-regression.spec.ts
@@ -61,7 +61,7 @@ test.describe('Bug #589 Regression: 出院带药医嘱类型与交互', () => {
   });
 });
 
-test.describe('Bug #585 Regression: 手术申请历史列表状态列', () => {
+test.describe('Bug #584 Regression: 手术申请历史列表操作列按钮动态显示', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/login');
     await page.fill('input[name="username"]', 'doctor1');
@@ -70,42 +70,48 @@ test.describe('Bug #585 Regression: 手术申请历史列表状态列', () => {
     await page.waitForURL(/\/inpatient/);
     await page.click('.patient-list-item:first-child');
     await page.click('text=手术申请');
-    await page.waitForSelector('.surgery-apply-history');
+    await page.waitForTimeout(800);
   });
 
-  test('@bug585 @regression 验证状态列存在且位于申请者与操作列之间', async ({ page }) => {
-    const headers = page.locator('.el-table__header th .cell');
-    await expect(headers.nth(5)).toHaveText('申请者');
-    await expect(headers.nth(6)).toHaveText('状态');
-    await expect(headers.nth(7)).toHaveText('操作');
-  });
-
-  test('@bug585 @regression 验证状态标签颜色与文本映射正确', async ({ page }) => {
-    // 模拟不同状态数据渲染（依赖后端Mock或测试数据）
-    const statusMap = [
-      { code: 1, text: '待签发', color: 'info' },
-      { code: 2, text: '已签发', color: 'primary' },
-      { code: 3, text: '已校对', color: 'primary' },
-      { code: 4, text: '已执行', color: 'primary' },
-      { code: 5, text: '已安排', color: 'warning' },
-      { code: 6, text: '已完成', color: 'success' },
-      { code: 10, text: '已撤销', color: 'danger' }
-    ];
-
-    for (const s of statusMap) {
-      // 验证状态筛选下拉框包含对应选项
-      await page.locator('.filter-bar .el-select__input').click();
-      await expect(page.locator(`.el-select-dropdown__item:has-text("${s.text}")`)).toBeVisible();
-    }
-  });
-
-  test('@bug585 @regression 验证状态筛选功能可用', async ({ page }) => {
-    await page.locator('.filter-bar .el-select__input').click();
+  test('@bug584 @regression 验证待签发状态显示编辑、详情、删除按钮', async ({ page }) => {
+    await page.locator('.el-select__input').click();
     await page.locator('.el-select-dropdown__item:has-text("待签发")').click();
-    await page.click('.filter-bar .el-button--primary');
+    await page.click('text=查询');
     await page.waitForTimeout(500);
-    // 验证列表仅展示待签发状态数据（通过检查Tag类型）
-    const tags = page.locator('.el-table__body .el-tag--info');
-    await expect(tags.first()).toBeVisible();
+    
+    const firstRow = page.locator('.el-table__body tr').first();
+    await expect(firstRow.locator('text=详情')).toBeVisible();
+    await expect(firstRow.locator('text=编辑')).toBeVisible();
+    await expect(firstRow.locator('text=删除')).toBeVisible();
+    await expect(firstRow.locator('text=撤回')).toBeHidden();
+    await expect(firstRow.locator('text=打印')).toBeHidden();
+  });
+
+  test('@bug584 @regression 验证已签发状态显示撤回、详情按钮', async ({ page }) => {
+    await page.locator('.el-select__input').click();
+    await page.locator('.el-select-dropdown__item:has-text("已签发")').click();
+    await page.click('text=查询');
+    await page.waitForTimeout(500);
+    
+    const firstRow = page.locator('.el-table__body tr').first();
+    await expect(firstRow.locator('text=详情')).toBeVisible();
+    await expect(firstRow.locator('text=撤回')).toBeVisible();
+    await expect(firstRow.locator('text=编辑')).toBeHidden();
+    await expect(firstRow.locator('text=删除')).toBeHidden();
+    await expect(firstRow.locator('text=打印')).toBeHidden();
+  });
+
+  test('@bug584 @regression 验证已校对/执行/安排/完成状态显示详情、打印按钮', async ({ page }) => {
+    await page.locator('.el-select__input').click();
+    await page.locator('.el-select-dropdown__item:has-text("已校对")').click();
+    await page.click('text=查询');
+    await page.waitForTimeout(500);
+    
+    const firstRow = page.locator('.el-table__body tr').first();
+    await expect(firstRow.locator('text=详情')).toBeVisible();
+    await expect(firstRow.locator('text=打印')).toBeVisible();
+    await expect(firstRow.locator('text=编辑')).toBeHidden();
+    await expect(firstRow.locator('text=撤回')).toBeHidden();
+    await expect(firstRow.locator('text=删除')).toBeHidden();
   });
 });