From e35a900f36bea44723cdfb0df735cf6559669801 Mon Sep 17 00:00:00 2001
From: wuyy <czlis@wuyy>
Date: Fri, 10 Jul 2026 17:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E8=A1=80=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.ts                             |   57 +
 src/api/doctor/application.ts                 |  130 ++
 src/api/doctor/assessment.ts                  |    8 +
 src/assets/styles/index.scss                  |  136 +-
 src/components/CheckUser/index.vue            |  113 ++
 src/components/DropdownTableSelect/index.vue  |  214 ++-
 src/components/SelectTable/index.vue          |   41 +-
 src/hooks/index.ts                            |    5 +-
 src/hooks/useCommonDict.ts                    |  102 ++
 src/layout/index.vue                          |    3 +-
 src/utils/dict.ts                             |    1 +
 src/utils/request.ts                          |    2 +
 .../application/component/reviewComments.vue  |  142 ++
 src/views/doctor/application/index.vue        | 1412 ++++++++++++-----
 src/views/doctor/assessment/index.vue         |   39 +-
 src/views/doctor/autologous/index.vue         |   17 +
 src/views/doctor/treatment/index copy.vue     |  313 ++++
 src/views/doctor/treatment/index.vue          |   11 +
 src/views/liswork/dict/index.vue              |    2 +
 19 files changed, 2257 insertions(+), 491 deletions(-)
 create mode 100644 src/api/doctor/application.ts
 create mode 100644 src/components/CheckUser/index.vue
 create mode 100644 src/hooks/useCommonDict.ts
 create mode 100644 src/views/doctor/application/component/reviewComments.vue
 create mode 100644 src/views/doctor/autologous/index.vue
 create mode 100644 src/views/doctor/treatment/index copy.vue
 create mode 100644 src/views/doctor/treatment/index.vue

diff --git a/src/api/common.ts b/src/api/common.ts
index 1c57189..7b5dccc 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -23,4 +23,61 @@ export function queryLisProject(query?: Object) {
     method: 'post',
     data: query
   })
+}
+// 获取员工数据
+export function queryUserInfo(query?: Object) {
+  return request({
+    url: '/bus/common/queryUserInfo',
+    method: 'get',
+    params: query
+  })
+}
+// 获取当前服务器时间
+export function currentDateTime(query?: Object) {
+  return request({
+    url: '/bus/common/currentDateTime',
+    method: 'get',
+    params: query
+  })
+}
+// 获取有效的血液品种
+export function getBloodBreed(query?: Object) {
+  return request({
+    url: '/bus/common/getBloodBreed',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询单病种信息列表
+export function queryIllDiagnoseList(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/queryIllDiagnoseList',
+    method: 'get',
+    params: query
+  })
+}
+// 校验用户名和密码是否成功
+export function checkLoginAffirm(query?: Object) {
+  return request({
+    url: '/bus/common/checkLoginAffirm',
+    method: 'get',
+    params: query
+  })
+}
+// 获取员工的部门类型
+export function getDeptType(query?: Object) {
+  return request({
+    url: '/bus/common/getDeptType',
+    method: 'get',
+    params: query
+  })
+}
+// 查询手术字典
+export function queryOperation(query?: Object) {
+  return request({
+    url: '/bus/common/queryOperation',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/api/doctor/application.ts b/src/api/doctor/application.ts
new file mode 100644
index 0000000..3a53d46
--- /dev/null
+++ b/src/api/doctor/application.ts
@@ -0,0 +1,130 @@
+/**
+ * @file application.ts
+ * @description: 输血申请模块接口
+ * @author: w
+ * @since: 2026-07-06
+ */
+
+import request from '@/utils/request'
+
+// 查询申请单列表
+export function querysqList(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/queryList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取病人信息
+export function getPatInfo(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/getPatInfo',
+    method: 'get',
+    params: query
+  })
+}
+// 自体血校验
+export function checkSelfBlood(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/checkSelfBlood',
+    method: 'get',
+    params: query
+  })
+}
+// 校验是否符合输血指征的规则
+export function checkCausalis(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/checkCausalis',
+    method: 'post',
+    data: query
+  })
+}
+// 保存前校验
+export function savePreApplyInfo(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/savePreApplyInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 保存申请单
+export function saveApplyInfo(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/saveApplyInfo',
+    method: 'post',
+    data: query
+  })
+}
+// 查询单条申请单
+export function queryApplyOne(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/queryApplyOne',
+    method: 'get',
+    params: query
+  })
+}
+// 查询输血前评估信息列表
+export function queryApplyBeforeList(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/queryApplyBeforeList',
+    method: 'get',
+    params: query
+  })
+}
+// 申请单审核前校验
+export function applyCheck(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/applyCheck',
+    method: 'post',
+    data: query
+  })
+}
+// 取消申请单审核
+export function cancelApplyCheck(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/cancelApplyCheck',
+    method: 'get',
+    params: query
+  })
+}
+// 上级医生审核
+export function applyMedicCheck(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/applyMedicCheck',
+    method: 'post',
+    data: query
+  })
+}
+// 取消上级医生审核
+export function cancelApplyMedicCheck(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/cancelApplyMedicCheck',
+    method: 'post',
+    data: query
+  })
+}
+// 审核意见
+export function checkExplain(query?: Object) {
+  return request({
+    url: '/bus/doctor/checkExplain/checkExplain',
+    method: 'post',
+    data: query
+  })
+}
+// 获取输血指征数据
+export function queryCausailsList(query?: Object) {
+  return request({
+    url: '/bus/doctor/checkExplain/queryCausailsList',
+    method: 'get',
+    params: query
+  })
+}
+// 作废申请单
+export function cancelApply(query?: Object) {
+  return request({
+    url: '/bus/doctor/apply/cancelApply',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/doctor/assessment.ts b/src/api/doctor/assessment.ts
index 15f2409..7c056fd 100644
--- a/src/api/doctor/assessment.ts
+++ b/src/api/doctor/assessment.ts
@@ -1,3 +1,11 @@
+/**
+ * @file assessment.ts
+ * @description: 输血评估模块接口
+ * @author: w
+ * @since: 2026-07-06
+ */
+
+
 import request from '@/utils/request'
 
 // 根据住院号获取病人信息
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 0fcf831..86f4df9 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -656,50 +656,91 @@ aside {
 
 
 .vxe-table {
-  border: 1px solid #96B8D9 !important;
-  // border-top: none !important;
-  /* 蓝色外边框 */
-  border-radius: .5rem;
+  // border: 1px solid #ccc !important;
   /* 可选：添加边框圆角 */
   overflow: hidden;
 }
 
 .mytable-style {
+  .vxe-table.border--full {
+    border: 1px solid #ccc !important;
 
-  .vxe-header--column {
-    word-break: break-word;
-    background-color: #f6fafc !important;
-    color: #3c526f;
-    height: 1.875rem !important;
-    line-height: 1.875rem !important;
-    padding: 0 !important;
-    font-size: 16px;
-    border-color: #f6fafc !important;
+    .vxe-header--column,
+    .vxe-body--column,
+    .vxe-footer--column {
+      border-right: 1px solid #ccc !important;
+      border-bottom: 1px solid #ccc !important;
+      height: 30px;
+      line-height: 30px;
+      padding: 0 !important;
+      background-image: none !important;
+
+      &:last-child {
+        // border-right: none !important;
+      }
+    }
+
+    .vxe-footer--column {
+      border-bottom: none !important;
+    }
+
+
+    /* 表头最下方单元格强制底红线  */
+    .vxe-header--row:last-of-type .vxe-header--column {
+      border-bottom: 1px solid #ccc !important;
+    }
+
+    .vxe-body--row {
+      border-bottom: 1px solid #ccc !important;
+    }
+
+    .vxe-footer--row.vxe-footer--row {
+      border-top: 1px solid #ccc !important;
+    }
+
+
+
+    .vxe-header--row th {
+      height: 30px !important;
+      line-height: 30px;
+      padding: 0 !important;
+    }
+
+    .vxe-body--row td {
+      height: 30px !important;
+      line-height: 30px;
+      padding: 0 !important;
+    }
+
+
+    .vxe-footer--row td {
+      height: 30px !important;
+      line-height: 30px;
+      font-size: 13px;
+      font-weight: 700;
+      padding: 0 !important;
+    }
+
+    /* 清除最后一列重复竖线，避免双线重叠 */
+    .vxe-header--col:last-child .vxe-header--column,
+    .vxe-body--col:last-child .vxe-body--column,
+    .vxe-footer--col:last-child .vxe-footer--column {
+      border-right: none !important;
+    }
   }
 
-  .vxe-table--render-default.is--padding .vxe-body--column .vxe-cell {
-    padding: 0 !important;
+  .vxe-table--render-default .vxe-table--footer-wrapper {
+    border-top: 1px solid #ccc !important;
   }
 
-  .vxe-table--render-default .vxe-header--column .vxe-cell {
-    padding: 0 !important;
-  }
-
-  .vxe-table--render-default .vxe-body--column,
-  .vxe-footer--column,
-  .col--ellipsis {
-    height: 1.875rem !important;
-    line-height: 1.875rem !important;
-  }
-
-  .el-checkbox {
-    height: 1.875rem !important;
+  .vxe-table--header-wrapper {
+    border-bottom: 1px solid #ccc !important;
+    background-color: #eff6fa !important;
   }
 }
 
 
 
-
 // 高亮
 .vxe-table--render-default .vxe-body--row.row--current {
   background-color: #a4beef !important;
@@ -765,4 +806,41 @@ aside {
       box-shadow: none !important;
     }
   }
+}
+
+
+.el-input.is-disabled .el-input__wrapper {
+  background-color: #f5f7fa !important;
+}
+
+.el-select__wrapper.is-disabled {
+  background-color: #f5f7fa !important;
+}
+
+.el-select__wrapper.is-disabled .el-select__selected-item {
+  color: #606266 !important;
+}
+
+.el-date-editor.is-disabled,
+.el-date-editor.is-disabled .el-input__wrapper {
+  background-color: #f5f7fa !important;
+}
+
+.el-radio__input.is-disabled+span.el-radio__label,
+.el-checkbox.is-disabled {
+  color: #606266 !important;
+}
+
+.el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background: #00a5ff;
+  border-color: #00a5ff;
+
+  &::after {
+    background: #f5f7fa;
+
+  }
+}
+
+.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
+  background: #00a5ff;
 }
\ No newline at end of file
diff --git a/src/components/CheckUser/index.vue b/src/components/CheckUser/index.vue
new file mode 100644
index 0000000..a1f5fe4
--- /dev/null
+++ b/src/components/CheckUser/index.vue
@@ -0,0 +1,113 @@
+<template>
+  <div>
+    <el-dialog v-model="checkShow" :title="title" width="500" :close-on-click-modal="false" :draggable="true"
+      @close="close">
+      <el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" :rules="rules" label-width="auto">
+        <el-form-item label="用户工号：" prop="yhdh">
+          <el-input ref="yhdhRef" v-model.trim="ruleForm.yhdh" placeholder="请输入用户工号" maxlength="20"
+            @keyup.enter="handleConfirm" />
+        </el-form-item>
+        <el-form-item label="密码：" prop="mm">
+          <el-input v-model.trim="ruleForm.mm" placeholder="请输入密码" type="mm" maxlength="20" show-password
+            @keyup.enter="handleConfirm" />
+        </el-form-item>
+        <el-form-item>
+          <div style="text-align: center; width: 100%;">
+            <el-button type="primary" @click="handleConfirm()"> 确认 </el-button>
+            <el-button @click="handleCancel">取消</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+
+// 组件属性
+const props = defineProps({
+  // 弹窗标题（由外部参数控制）
+  title: {
+    type: String,
+    default: '用户身份验证'
+  },
+  // 验证规则（可选，由外部传入）
+  validationRules: {
+    type: Object,
+    default: () => ({
+      // 工号最小长度
+      userIdMinLength: 3,
+      // 密码最小长度
+      passwordMinLength: 6
+    })
+  }
+});
+
+// 组件事件
+const emit = defineEmits([
+  'onConfirm',       // 验证成功回调
+  'onCancel'
+]);
+
+// 表单数据
+const ruleForm = ref({
+  yhdh: '',
+  mm: '',
+});
+
+const rules = ref(
+  {
+    yhdh: [{ required: true, message: "请输入用户工号", trigger: "blur" },],
+    mm: [{ required: true, message: "请输入密码", trigger: "blur" },]
+  }
+);
+const yhdhRef = ref();
+const open = () => {
+  checkShow.value = true;
+  flag.value = true;
+  nextTick(() => {
+    setTimeout(() => {
+      yhdhRef.value.focus();
+    }, 100);
+  });
+};
+const checkShow = ref(false);
+const ruleFormRef = ref();
+const flag = ref(true);
+// 处理确认验证
+const handleConfirm = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      emit('onConfirm', { yhdh: ruleForm.value.yhdh, mm: ruleForm.value.mm });
+      flag.value = false;
+      checkShow.value = false;
+    } else {
+      return false;
+    }
+  });
+};
+
+
+const handleCancel = () => {
+  checkShow.value = false;
+  ruleForm.value.yhdh = '';
+  ruleForm.value.mm = '';
+  ruleFormRef.value.resetFields();
+  emit('onCancel');
+};
+
+const close = () => {
+  ruleForm.value.yhdh = '';
+  ruleForm.value.mm = '';
+  ruleFormRef.value.resetFields();
+  if (flag.value) {
+    emit('onCancel');
+  }
+};
+
+defineExpose({
+  open,
+});
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/components/DropdownTableSelect/index.vue b/src/components/DropdownTableSelect/index.vue
index ef51174..275ad87 100644
--- a/src/components/DropdownTableSelect/index.vue
+++ b/src/components/DropdownTableSelect/index.vue
@@ -1,12 +1,7 @@
-/**
-* @file index.vue
-* @description: 下拉表格选择
-* @author: w
-* @since: 2026-06-18
-*/
 <template>
   <div class="dropdown-table-select" :style="{ width: inputWidth }">
-    <el-dropdown ref="dropdownRef" trigger="manual" placement="bottom-start" style="width:100%">
+    <el-dropdown ref="dropdownRef" trigger="manual" placement="bottom-start" style="width:100%" :teleported="false"
+      :popper-style="{ width: realtableWidth }">
       <div class="input-wrap" style="width:100%">
         <el-input v-model="inputText" :placeholder="placeholder" @keydown.enter.prevent="handleInputEnter" />
         <span class="arrow-icon" @click.stop="toggleDropdown">
@@ -16,17 +11,35 @@
         </span>
       </div>
       <template #dropdown>
-        <div class="table-panel" :style="{ width: panelWidth }">
-          <el-table :data="tableData" border :height="tableHeight" @row-click="handleRowClick" v-loading="tableLoading">
-            <el-table-column v-for="col in columnList" :key="col.prop" :label="col.label" :prop="col.prop"
-              :width="col.width" :align="col.align || 'center'" />
-          </el-table>
+        <div class="table-panel mytable-style" style="width:100%">
+          <!-- 搜索框-->
+          <div style="text-align: left;" v-if="props.showSearch">
+            <el-input v-model="searchKey" ref="searchInput" size="small" placeholder="快速搜索(支持简拼)" class="mb10" clearable
+              @clear="filterDataHandle" @input="filterDataHandle" @keydown="handleInputKeydown" />
+          </div>
+          <!-- 空数据提示 -->
+          <el-empty v-if="filterData.length === 0" description="没有匹配的数据" :image-size="100" />
+          <!-- 表格容器增加键盘监听 -->
+          <div v-else @keydown="handleTableKeydown" tabindex="0" style="outline: none;">
+            <vxe-table ref="tableRef" border resizable max-height="350px" v-loading="tableLoading"
+              :row-config="{ isHover: true, keyField: labelField, height: 30, isCurrent: true }" :data="filterData"
+              :current-row="currentRow" @cell-click="handleRowClick"
+              :tooltip-config="{ appendToBody: true, zIndex: 3000 }" :show-overflow="true"
+              :scroll-y="{ enabled: true, rSize: 30, height: '100%', oSize: 20, gt: 30, }">
+              <vxe-table-column v-for="field in props.columnList" :key="field.prop" :field="field.prop"
+                :title="field.label" align="center" :width="field.width" min-width="100" />
+            </vxe-table>
+          </div>
         </div>
       </template>
     </el-dropdown>
   </div>
 </template>
+
 <script setup lang="ts">
+import { ArrowDown } from '@element-plus/icons-vue'
+// 引入拼音首字母工具 
+import { getFirstLetter } from '@/utils/pinyin';
 
 export interface TableColumnItem {
   label: string
@@ -35,6 +48,7 @@ export interface TableColumnItem {
   align?: 'left' | 'center' | 'right'
 }
 export type TableRowItem = Record<string, any>
+
 const props = defineProps({
   // 绑定值
   modelValue: {
@@ -46,48 +60,174 @@ const props = defineProps({
     type: String,
     default: ''
   },
-  // 绑定值字段  
+  // 绑定值字段
   labelField: {
     type: String,
     default: 'billNo'
   },
-  // 输入框宽度  
+  // 输入框宽度
   inputWidth: {
     type: String,
     default: '100%'
   },
-  // 下拉面板宽度 
-  panelWidth: {
+  // 表格宽度
+  tableWidth: {
     type: String,
-    default: '700px'
+    default: '100%'
   },
-  //表格高度  
+  // 表格高度
   tableHeight: {
     type: String,
     default: '150px'
   },
-  // 表格列 父必传，无默认值
+  // 是否显示表头
+  showHeader: {
+    type: Boolean,
+    default: true
+  },
+  // 表格列配置
   columnList: {
     type: Array as () => TableColumnItem[],
     required: true
   },
-  // 表格数据 父必传
+  // 表格原始数据
   tableData: {
     type: Array as () => TableRowItem[],
     required: true
+  },
+  //是否展示搜索框 
+  showSearch: {
+    type: Boolean,
+    default: true
   }
 })
+
 const emit = defineEmits<{
   'update:modelValue': [val: string]
   change: [row: TableRowItem]
   open: []
   search: [val: string]
 }>()
+
 const bindField = props.labelField ?? 'billNo'
 const dropdownRef = useTemplateRef('dropdownRef')
 const showPanel = ref(false)
 const inputText = ref('')
 const tableLoading = ref(false)
+const currentRow = ref<any>(null)
+const tableRef = useTemplateRef('tableRef')
+// 搜索相关变量 
+const searchKey = ref('');
+const searchInput = ref();
+// 预处理带拼音的完整原始数据
+const processedTableData = ref<{ [key: string]: any; pinyinMap: Record<string, string> }[]>([]);
+// 过滤后渲染表格的数据
+const filterData = ref<{ [key: string]: any; pinyinMap: Record<string, string> }[]>([]);
+const currentIndex = ref(-1);
+
+const realtableWidth = computed(() => {
+  if (props.tableWidth === '100%') {
+    return props.inputWidth
+  }
+  return props.tableWidth
+})
+
+// 数据预处理生成拼音简拼 
+const processTableData = (data: TableRowItem[]) => {
+  const list = Array.isArray(data) ? data : [];
+  return list.map((item: any) => {
+    const pinyinMap: Record<string, string> = {};
+    // 所有列都生成拼音用于检索
+    props.columnList.forEach((field) => {
+      if (item[field.prop]) {
+        pinyinMap[field.prop] = getFirstLetter(item[field.prop]).toLowerCase();
+      }
+    });
+    return { ...item, pinyinMap };
+  });
+};
+
+//搜索过滤逻辑 
+const filterDataHandle = () => {
+  const key = searchKey.value.trim().toLowerCase();
+  if (!key) {
+    filterData.value = [...processedTableData.value];
+    currentIndex.value = -1;
+    return;
+  }
+  currentIndex.value = 0;
+  filterData.value = processedTableData.value.filter((item) => {
+    let match = false;
+    // 遍历所有列：文本匹配 + 拼音简拼匹配
+    props.columnList.forEach((field) => {
+      const text = item[field.prop]?.toString().toLowerCase() || '';
+      const pinyin = item.pinyinMap[field.prop] || '';
+      if (text.includes(key) || pinyin.includes(key)) {
+        match = true;
+      }
+    });
+    return match;
+  });
+  // 过滤完成自动选中第一行
+  if (filterData.value.length > 0) {
+    nextTick(() => {
+      tableRef.value?.setCurrentRow(filterData.value[0]);
+      tableRef.value?.scrollToRow(filterData.value[0]);
+    });
+  } else {
+    tableRef.value?.clearCurrentRow();
+  }
+};
+
+//搜索框上下回车键盘事件 ==========
+const handleInputKeydown = (e: KeyboardEvent) => {
+  if (!['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) return;
+  e.stopPropagation();
+  if (filterData.value.length > 0) {
+    nextTick(() => {
+      const tableBox = searchInput.value.$el.closest('.table-panel').querySelector('div[tabindex="0"]') as HTMLElement;
+      if (tableBox) {
+        tableBox.focus();
+        tableBox.dispatchEvent(new KeyboardEvent('keydown', { key: e.key }));
+      }
+    });
+    if (e.key === 'Enter') {
+      const targetRow = filterData.value[currentIndex.value];
+      targetRow && handleRowClick({ row: targetRow });
+    }
+  }
+};
+
+//表格容器上下键导航 ==========
+const handleTableKeydown = (e: KeyboardEvent) => {
+  if (!['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) return;
+  e.preventDefault();
+  const maxIdx = filterData.value.length - 1;
+  if (e.key === 'ArrowUp') {
+    currentIndex.value = Math.max(0, currentIndex.value - 1);
+  } else if (e.key === 'ArrowDown') {
+    currentIndex.value = Math.min(maxIdx, currentIndex.value + 1);
+  }
+  tableRef.value.setCurrentRow(filterData.value[currentIndex.value]);
+  tableRef.value.scrollToRow(filterData.value[currentIndex.value]);
+  if (e.key === 'Enter') {
+    const targetRow = filterData.value[currentIndex.value];
+    targetRow && handleRowClick({ row: targetRow });
+  }
+};
+
+// ========== 监听原始表格数据变化，重新生成拼音数据 ==========
+watch(
+  () => props.tableData,
+  (newVal) => {
+    if (!Array.isArray(newVal)) return;
+    processedTableData.value = processTableData(newVal);
+    filterDataHandle();
+  },
+  { deep: true, immediate: true }
+)
+
+// 原有监听逻辑不变
 watch(
   () => props.modelValue,
   (val) => {
@@ -99,13 +239,13 @@ watch(inputText, (val) => {
   emit('update:modelValue', val)
 })
 
-// 回车处理
+// 输入框回车（原有逻辑）
 const handleInputEnter = (e: KeyboardEvent) => {
-  e.stopPropagation();
+  e.stopPropagation()
   emit('search', inputText.value)
 }
 
-// 仅点击箭头才切换下拉
+// 切换下拉框（修改：打开时聚焦搜索框、刷新过滤）
 const toggleDropdown = () => {
   if (!dropdownRef.value) return
   showPanel.value = !showPanel.value
@@ -113,24 +253,32 @@ const toggleDropdown = () => {
     dropdownRef.value.handleOpen()
     tableLoading.value = true
     emit('open')
+    searchKey.value = '';
+    filterDataHandle();
     setTimeout(() => {
       tableLoading.value = false
+      // 只有开启搜索框才聚焦
+      if (props.showSearch && searchInput.value) {
+        searchInput.value?.focus();
+      }
     }, 300)
   } else {
     dropdownRef.value.handleClose()
   }
 }
 
-// 行点击选中
-const handleRowClick = (row: TableRowItem) => {
-  const text = row[bindField] ?? ''
+// 表格行点击（原有逻辑完全不变）
+const handleRowClick = (params: { row: TableRowItem }) => {
+  const text = params.row[bindField] ?? ''
   inputText.value = text
   emit('update:modelValue', text)
-  emit('change', row)
+  emit('change', params.row)
+  currentRow.value = params.row
   dropdownRef.value?.handleClose()
   showPanel.value = false
 }
 </script>
+
 <style scoped lang="scss">
 .dropdown-table-select {
   .input-wrap {
@@ -152,6 +300,18 @@ const handleRowClick = (row: TableRowItem) => {
 
   .table-panel {
     padding: 12px;
+    width: 100%;
   }
 }
+
+/* 只清除最小宽度限制，删除强制 width:100% 代码 */
+:deep(.el-popper) {
+  min-width: 0 !important;
+  max-width: none !important;
+}
+
+/* 修复vxe-table滚动空白样式 */
+:deep(.vxe-table--body) {
+  overflow-anchor: none;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue
index 3f88be7..72dc9a0 100644
--- a/src/components/SelectTable/index.vue
+++ b/src/components/SelectTable/index.vue
@@ -29,18 +29,18 @@
           </div>
           <!-- 数据为空时显示空状态提示 -->
           <el-empty v-if="filterData.length === 0" description="没有匹配的数据" :image-size="100" />
-          <div @keydown="handleKeydown" v-else tabindex="0" style="outline: none;">
+          <div @keydown="handleKeydown" v-else tabindex="0" style="outline: none;" class="mytable-style">
             <!-- 数据存在时显示表格 -->
             <!-- <el-table ref="tableRef" :data="filterData" :highlight-current-row="props.isHighlight" style="width: 100%"
               :border="props.border" @row-click="handleRowChange" max-height="350px" :row-style="{ height: '25px' }">
               <el-table-column v-for="field in props.fields" :prop="field.prop" :label="field.label"
                 :width="field.width" show-overflow-tooltip align="center" />
             </el-table> -->
-            <vxe-table class="mytable-style" ref="tableRef" border resizable max-height="350px"
+            <vxe-table ref="tableRef" border resizable max-height="350px"
               :row-config="{ isHover: true, keyField: 'value', height: 30, isCurrent: true }" :data="filterData"
               :current-row="currentRow" @cell-click="currentChange"
               :tooltip-config="{ appendToBody: true, zIndex: 3000 }" :show-overflow="true"
-              :scroll-y="{ enabled: true, rSize: 30, height: '100%' }">
+              :scroll-y="{ enabled: true, rSize: 30, height: '100%', oSize: 20, gt: 30, }">
               <vxe-table-column v-for="field in props.fields" :field="field.prop" :title="field.label" align="center"
                 :width="field.width" min-width="150" />
             </vxe-table>
@@ -359,23 +359,6 @@ const clearHandle = () => {
   width: 100%;
 }
 
-:deep(.vxe-header--row th) {
-  border-color: #00a5ff;
-  // background-color: #e6edf9;
-  font-size: 14px;
-}
-
-:deep(.vxe-body--row td) {
-  border-color: #00a5ff;
-}
-
-:deep(.vxe-table--row-hover) {
-  background-color: #00a5ff;
-}
-
-:deep(.vxe-table--current-row) {
-  background-color: #00a5ff;
-}
 
 :deep(.el-table-header-cell) {
   cursor: move;
@@ -383,20 +366,16 @@ const clearHandle = () => {
 }
 
 // 表格边框  
-:deep(.vxe-table--render-default.border--full .vxe-body--column) {
-  background-image: linear-gradient(#96B8D9, #96B8D9), linear-gradient(#96B8D9, #96B8D9) !important;
-}
+// :deep(.vxe-table--render-default.border--full .vxe-body--column) {
+//   background-image: linear-gradient(#ccc, #ccc), linear-gradient(#ccc, #ccc) !important;
+// }
 
-// 表头边框 
-:deep(.vxe-table--render-default.border--full .vxe-header--column) {
-  background-image: linear-gradient(#e6edf9, #e6edf9), linear-gradient(#e6edf9, #e6edf9) !important;
-}
+// // 表头边框 
+// :deep(.vxe-table--render-default.border--full .vxe-header--column) {
+//   background-image: linear-gradient(#ccc, #ccc), linear-gradient(#ccc, #ccc) !important;
+// }
 
 .select-table-dropdown {
   padding: 8px;
 }
-
-:deep(.el-table .el-table__cell) {
-  padding: 0;
-}
 </style>
\ No newline at end of file
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index cb4a2c5..dca08c0 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -1 +1,4 @@
-export * from './lisData/dictData';
\ No newline at end of file
+export * from './lisData/dictData';
+export * from './useSysParam'
+export * from './messageBox'
+export * from './useCommonDict'
\ No newline at end of file
diff --git a/src/hooks/useCommonDict.ts b/src/hooks/useCommonDict.ts
new file mode 100644
index 0000000..3c61df2
--- /dev/null
+++ b/src/hooks/useCommonDict.ts
@@ -0,0 +1,102 @@
+import { queryLisProject, queryUserInfo, currentDateTime, getBloodBreed, queryIllDiagnoseList } from '@/api/common'
+import dayjs from 'dayjs'
+// 员工下拉类型
+type option = {
+  label: string
+  value: string
+}
+// 血液品种下拉类型 
+type BreedOption = {
+  label: string
+  value: string
+  unit: string
+}
+
+// 检验项目表格初始行结构
+type LisProjectRow = {
+  bill_no: string
+  item_name: string
+  item_result: string
+  item_unit: string
+  test_date: string
+  sid: string | number
+}
+
+
+
+export function useCommonDict() {
+
+  const getServerTime = async () => {
+    const res = await currentDateTime()
+    return res.data
+  }
+
+  // 员工下拉列表
+  const userList = ref<option[]>([])
+  const getUserData = async () => {
+    const res = await queryUserInfo()
+    userList.value = res.rows.map(item => ({
+      label: item.nickName,
+      value: item.userName
+    }))
+  }
+
+  // 血液品种下拉
+  const bloodBreed = ref<BreedOption[]>([])
+  const getBloodList = async () => {
+    const res = await getBloodBreed()
+    bloodBreed.value = res.data.map(item => ({
+      label: item.breed_name,
+      value: item.breed_code,
+      unit: item.unit
+    }))
+  }
+
+  // 检验项目LIS项目 
+  const lisProject = ref<LisProjectRow[]>([])
+  const getLisProject = async () => {
+    const res = await queryLisProject({ need: 'Y' })
+    lisProject.value = res.data.map(item => ({
+      bill_no: '',
+      item_name: item.pro_name,
+      item_result: '',
+      item_unit: item.unit,
+      test_date: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      sid: item.sid
+    }))
+    return lisProject.value
+  }
+
+  // 单病种列表 
+  const diaList = ref<option[]>([])
+  const getDiaList = async () => {
+    const res = await queryIllDiagnoseList({ pageSize: 9999, pageNum: 1 })
+    diaList.value = res.rows.map(item => ({
+      label: item.dia_Name,
+      value: item.dia_Code
+    }))
+  }
+
+  // 一次性加载 
+  const loadAllDict = async () => {
+    await Promise.all([
+      getUserData(),
+      getBloodList(),
+      getLisProject(),
+      getDiaList()
+    ])
+  }
+
+  return {
+    getServerTime,
+    userList,
+    getUserData,
+    bloodBreed,
+    getBloodList,
+    loadAllDict,
+    lisProject,
+    getLisProject,
+    diaList,
+    getDiaList
+  }
+}
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 0f3b2f4..cb7f076 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -25,8 +25,9 @@ const { initAllParams } = useSysParam()
 
 // ========== 在这里统一维护【所有需要全局获取的参数 key】 ==========
 const GLOBAL_PARAM_KEYS = [
-  'YBZFXMTSXX',   // YBZFXMTSXX
+  'YBZFXMTSXX',   // 输血报销
   'HZBQGY',   //    患者病情概要是否必填
+  'SQDSFKRLXGXX',//输血申请时是否可从HIS系统中调出患者信息，是否可以录入修改患者血型？以"/"分隔，"/"前指可以调出患者信息时是否可以修改患者血型(Y可以修改N不可以修改)，"/"后指不可以调出患者信息时是否可以录入全部和只能录入"未知"患者血型(Y可以录入全部N只能录入"未知")
 ]
 
 const settingsStore = useSettingsStore()
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 98887ba..089fa84 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -81,6 +81,7 @@ export function comDict(...args: string[]): Promise<DictResult> {
         const dictList = resp.data.map((p: any) => ({
           label: p.wordbook_name,
           value: p.wordbook_code,
+          remark: p.remark,
         }));
 
         res.value[dictType] = dictList;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f91934b..da7b25e 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -131,6 +131,8 @@ service.interceptors.response.use((res: any) => {
       duration: 0,
     })
     return Promise.resolve(res.data)
+  } else if (code === 2) {
+    return Promise.resolve(res.data)
   } else if (code === 3) {
     ElMessage({
       message: msg,
diff --git a/src/views/doctor/application/component/reviewComments.vue b/src/views/doctor/application/component/reviewComments.vue
new file mode 100644
index 0000000..995b80b
--- /dev/null
+++ b/src/views/doctor/application/component/reviewComments.vue
@@ -0,0 +1,142 @@
+<template>
+  <el-dialog v-model="dialogVisible" title="审核意见" width="900px" :close-on-click-modal="false" @close="resetForm">
+    <!-- 上方指征表格 -->
+    <el-table ref="tableRef" :data="tableData" border style="margin-bottom: 16px" max-height="320"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="指征名称" prop="indicateName" min-width="280" />
+      <el-table-column label="补充说明" prop="remark" min-width="320" />
+    </el-table>
+
+    <!-- 下方表单区域 -->
+    <el-form label-width="130px" :model="indicationForm" :rules="rules">
+      <el-form-item label="审核意见" prop="checkResult">
+        <SelectTable v-model:data="indicationForm.checkResult" dict-type="sqdshyj" placeholder="" />
+      </el-form-item>
+      <el-form-item label="审核备注">
+        <el-input v-model="indicationForm.checkExplain" type="textarea" :rows="4" placeholder="" />
+      </el-form-item>
+      <el-form-item label="上次血型复核">
+        <span>{{ indicationForm.checkDateText }}</span>
+      </el-form-item>
+      <div class="row-flex">
+        <el-form-item label="是否需要血型复核">
+          <el-checkbox v-model="indicationForm.needCheck" true-value="Y" false-value="N" />
+        </el-form-item>
+        <el-form-item label="输血合理性">
+          <el-select v-model="indicationForm.validFlag" placeholder="" style="width:150px">
+            <el-option label="合理" value="Y"></el-option>
+            <el-option label="不合理" value="N"></el-option>
+            <el-option label="待定" value="W"></el-option>
+          </el-select>
+        </el-form-item>
+      </div>
+
+
+    </el-form>
+
+    <template #footer>
+      <el-button type="primary" @click="handleSubmit">确定</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import type { ElTable } from 'element-plus'
+import { checkExplain, queryCausailsList } from '@/api/doctor/application'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus'
+// 弹窗显隐 
+const dialogVisible = defineModel<boolean>()
+const tableRef = ref<InstanceType<typeof ElTable>>()
+// 存储表格勾选选中行
+const selectedRows = ref<any[]>([])
+
+const rules = {
+  checkResult: [{ required: true, message: '请选择审核意见', trigger: 'change' }]
+}
+// 表格数据源
+const tableData = ref<{ indicateName: string; remark: string }[]>([])
+
+// 表单变量
+const indicationForm = ref({
+  checkExplain: '',
+  auditRemark: '',
+  checkResult: '',
+  validFlag: '',
+  needCheck: 'N'
+})
+
+const emit = defineEmits<{
+  (e: 'success'): void
+}>()
+
+// 表格勾选事件
+const handleSelectionChange = (val: any[]) => {
+  selectedRows.value = val
+}
+
+// 提交逻辑
+const handleSubmit = async () => {
+  if (!indicationForm.value.checkResult) return ElMessage.error('请选择审核意见')
+  if (indicationForm.value.checkResult == '001' && indicationForm.value.validFlag == 'N') {
+    ElMessageBox.confirm(
+      `审核意见:【同意】，输血合理性为【不合理】确定继续吗？`,
+      '提示',
+      { type: 'warning', }
+    ).then(() => {
+      comfirm()
+    })
+  } else {
+    comfirm()
+  }
+}
+
+const comfirm = () => {
+  checkExplain(indicationForm.value).then(res => {
+    if (res.code == 0) {
+      ElMessage.success(res.msg)
+      emit('success')
+      dialogVisible.value = false
+    }
+  })
+}
+
+// 弹窗关闭重置表单、清空表格勾选
+const resetForm = () => {
+  indicationForm.value = {
+    checkExplain: '',
+    auditRemark: '',
+    checkResult: '',
+    validFlag: '',
+    needCheck: 'N'
+  }
+  selectedRows.value = []
+  // 清空表格勾选
+  tableRef.value?.clearSelection()
+}
+
+
+const open = (data) => {
+  indicationForm.value = data
+  dialogVisible.value = true
+  queryCausailsList({ billNo: data.applyNo }).then(res => {
+    tableData.value = res.data
+  })
+}
+
+
+defineExpose({
+  open
+})
+</script>
+
+<style scoped lang="scss">
+.row-flex {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/doctor/application/index.vue b/src/views/doctor/application/index.vue
index e58a790..0dff064 100644
--- a/src/views/doctor/application/index.vue
+++ b/src/views/doctor/application/index.vue
@@ -9,13 +9,13 @@
   <div class="box-container">
     <!-- 顶部工具栏 -->
     <div class="toolbar">
-      <el-button type="primary" plain>新增</el-button>
-      <el-button type="danger" plain>删除</el-button>
-      <el-button type="success" plain>保存</el-button>
+      <el-button type="primary" plain @click="openJsDialog">检索</el-button>
+      <el-button type="primary" plain @click="addHandle">新增</el-button>
+      <el-button type="success" plain @click="handleSubmit" :loading="saveLoading">保存</el-button>
       <el-button>电子病历</el-button>
-      <el-button>审核</el-button>
-      <el-button>取消审核</el-button>
-      <el-button>作废</el-button>
+      <el-button :loading="shLoading" @click="reviewHandle">审核</el-button>
+      <el-button type="danger" plain @click="cancelreviewHandle">取消审核</el-button>
+      <el-button type="info" plain @click="invalidateHandle">作废</el-button>
       <el-button type="warning" plain>打印输血申请单</el-button>
       <el-button>患者输血历史</el-button>
       <el-button type="warning" plain>打印大量输血审批单</el-button>
@@ -27,34 +27,38 @@
       <!-- 左侧区域 占2份 -->
       <div class="left-wrap">
         <!-- 包裹整个表单内容 -->
-        <el-form ref="formRef" :model="formData" label-width="auto" size="small" class="blood-transfusion-form">
+        <el-form ref="formRef" label-width="auto" size="small" class="blood-transfusion-form"
+          :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'">
           <!-- 申请信息 -->
           <div class="box-item">
-            <div class="box-title">申请信息</div>
             <el-row>
               <el-col :span="6">
-                <el-form-item label="申请单号" prop="applyNo">
-                  <el-input v-model="formData.applyNo" />
+                <el-form-item label="申请单号" prop="assess_bill_no">
+                  <el-input v-model="xkTransfuseApply.bill_no" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请日期" prop="applyDate">
-                  <el-date-picker v-model="formData.applyDate" type="datetime" style="width:100%" />
+                <el-form-item label="申请日期" prop="apply_date">
+                  <el-date-picker v-model="formData.apply_date" type="datetime" style="width:100%"
+                    value-format="YYYY-MM-DD HH:mm:ss" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
-                <el-form-item label="申请医师" prop="applyDoctor">
-                  <el-input v-model="formData.applyDoctor" />
+                <el-form-item label="申请医师" prop="apply_medic">
+                  <SelectTable v-model:data="xkTransfuseApply.apply_medic" :tableData="userList" size="small"
+                    placeholder="" :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
-                <el-form-item label="主治医师" prop="attendingDoctor">
-                  <el-input v-model="formData.attendingDoctor" />
+                <el-form-item label="主治医师" prop="attending_medic">
+                  <SelectTable v-model:data="xkTransfuseApply.attending_medic" :tableData="userList" size="small"
+                    placeholder="" :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
-                <el-form-item label="上级医师" prop="superiorDoctor">
-                  <el-input v-model="formData.superiorDoctor" />
+                <el-form-item label="上级医师" prop="check_medic">
+                  <SelectTable v-model:data="xkTransfuseApply.check_medic" :tableData="userList" size="small"
+                    placeholder="" :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -64,276 +68,289 @@
           <div class="box-item">
             <div class="box-title">患者信息</div>
             <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="住院号/ID号" prop="hospitalNo">
-                  <el-input v-model="formData.hospitalNo" />
+              <el-col :span="5">
+                <el-form-item label="住院号/ID号" prop="beinhos_id">
+                  <DropdownTableSelect v-model="xkTransfuseApply.beinhos_id" :columnList="pgcolumnList"
+                    :tableData="pgList" tableWidth="700px" labelField="beinhos_id" :showSearch="false" @open="getPgList"
+                    @change="getPgInfo" />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="姓名" prop="name">
-                  <el-input v-model="formData.name" />
+              <el-col :span="5">
+                <el-form-item label="姓名" prop="patient_name">
+                  <el-input v-model="xkPatientInfo.patient_name" />
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6">
+              <el-col :span="5">
                 <el-form-item label="性别" prop="patient_sex">
-                  <el-select v-model="formData.patient_sex" style="width:100%">
+                  <el-select v-model="xkPatientInfo.patient_sex" style="width:100%" @change="sexChange">
                     <el-option label="男" value="男" />
                     <el-option label="女" value="女" />
                     <el-option label="未知" value="未知" />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="血型" prop="bloodType">
-                  <el-input v-model="formData.bloodType" />
+              <el-col :span="5">
+                <el-form-item label="血型" prop="abo">
+                  <el-select v-model="xkPatientInfo.abo" placeholder="">
+                    <el-option v-for="v in dictData.abotype" :label="v.label" :value="v.value" />
+                  </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="5">
                 <el-form-item label="年龄" prop="age">
-                  <el-input v-model="formData.age" />
+                  <el-input v-model="xkPatientInfo.age" style="width:60%" />
+                  <div style="width: 40%">
+                    <el-select v-model="xkPatientInfo.nldw" placeholder="">
+                      <el-option v-for="v in dictData.nldw" :label="v.label" :value="v.value" />
+                    </el-select>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="科室" prop="dept_id">
+                  <SelectTable v-model:data="xkTransfuseApply.dept_id" :tableData="dictData.ks" size="small"
+                    placeholder="" :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="病区" prop="zone_id">
+                  <SelectTable v-model:data="xkTransfuseApply.zone_id" :tableData="dictData.bq" size="small"
+                    placeholder="" :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="Rh(D)" prop="rh">
+                  <el-select v-model="xkPatientInfo.rh" placeholder="">
+                    <el-option v-for="v in dictData.rhtype" :label="v.label" :value="v.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="属地" prop="apanage">
+                  <el-select v-model="xkPatientInfo.apanage" placeholder="">
+                    <el-option v-for="v in dictData.sd" :label="v.label" :value="v.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="床位号" prop="patient_bed">
+                  <el-input v-model="xkTransfuseApply.patient_bed" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="科室" prop="dept">
-                  <el-input v-model="formData.dept" />
+                <el-form-item label="科室类型" prop="dept_Type">
+                  <el-select v-model="xkTransfuseApply.dept_Type" placeholder="" style="width:50%" clearable
+                    @change="xkTransfuseApply.use_type = ''">
+                    <el-option v-for="v in dictData.depttype" :label="v.label" :value="v.value" />
+                  </el-select>
+
+                  <el-select v-model="xkTransfuseApply.use_type" placeholder="" style="width:50%" clearable
+                    v-if="xkTransfuseApply.dept_Type == 'A'">
+                    <el-option v-for="v in dictData.operatype" :label="v.label" :value="v.value" />
+                  </el-select>
+                  <el-select v-model="xkTransfuseApply.use_type" placeholder="" style="width:50%" clearable
+                    v-if="xkTransfuseApply.dept_Type == 'B'">
+                    <el-option v-for="v in dictData.nooperatype" :label="v.label" :value="v.value" />
+                  </el-select>
                 </el-form-item>
               </el-col>
+
               <el-col :span="6">
-                <el-form-item label="病区" prop="ward">
-                  <el-input v-model="formData.ward" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="Rh(D)" prop="rhd">
-                  <el-input v-model="formData.rhd" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="床位号" prop="bedNo">
-                  <el-input v-model="formData.bedNo" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="科室类型" prop="deptType">
-                  <el-input v-model="formData.deptType" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="单病种" prop="singleDisease">
-                  <el-input v-model="formData.singleDisease" />
+                <el-form-item label="单病种" prop="ill_Code">
+                  <SelectTable v-model:data="xkTransfuseApply.ill_Code" :tableData="diaList" size="small" placeholder=""
+                    :disabled="xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A'" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="临床诊断" prop="diagnosis">
-                  <el-input v-model="formData.diagnosis" />
+                <el-form-item label="临床诊断" prop="diagnoses">
+                  <DropdownTableSelect v-model="xkTransfuseApply.diagnoses" :columnList="dictList"
+                    :tableData="dictData.lczd" labelField="label" />
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
-                <el-form-item label="输血目的" prop="transPurpose">
-                  <el-select v-model="formData.transPurpose" style="width:100%">
-                    <el-option label="选项1" value="1" />
+                <el-form-item label="输血目的" prop="intent">
+                  <el-select v-model="xkTransfuseApply.intent" style="width:100%" filterable placeholder="">
+                    <el-option v-for="v in dictData.sxmd" :label="v.label" :value="v.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="输血指征" prop="transIndication">
-                  <el-select v-model="formData.transIndication" style="width:100%">
-                    <el-option label="选项1" value="1" />
+                <el-form-item label="输血指征" prop="causalis">
+                  <DropdownTableSelect v-model="xkTransfuseApply.causalis" :columnList="dictList"
+                    :tableData="dictData.sxzz" labelField="label" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手术名称" prop="operation_name">
+                  <DropdownTableSelect v-model="xkTransfuseApply.operation_name" :columnList="operationColumn"
+                    :tableData="operationList" tableWidth="350px" labelField="oper_name" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手术级别" prop="operation_level">
+                  <el-select v-model="xkTransfuseApply.operation_level" placeholder="">
+                    <el-option label="一级手术" value="1" />
+                    <el-option label="二级手术" value="2" />
+                    <el-option label="三级手术" value="3" />
+                    <el-option label="四级手术" value="4" />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="手术名称" prop="operationName">
-                  <el-input v-model="formData.operationName" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="手术级别" prop="operationLevel">
-                  <el-input v-model="formData.operationLevel" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="" prop="signedConsent">
-                  <el-checkbox v-model="formData.signedConsent">病人/病人家属是否签署输血同意书</el-checkbox>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="输血史" prop="hasTransfusionHistory">
-                  <el-radio-group v-model="formData.hasTransfusionHistory">
-                    <el-radio :value="1">有</el-radio>
-                    <el-radio :value="0">无</el-radio>
+              <el-col :span="8"></el-col>
+              <el-col :span="5">
+                <el-form-item label="输血史" prop="transfuse_history" label-width="95px">
+                  <el-radio-group v-model="xkPatientInfo.transfuse_history">
+                    <el-radio value="Y">有</el-radio>
+                    <el-radio value="N">无</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="反应史" prop="hasReactionHistory">
-                  <el-radio-group v-model="formData.hasReactionHistory">
-                    <el-radio :value="1">有</el-radio>
-                    <el-radio :value="0">无</el-radio>
+              <el-col :span="4">
+                <el-form-item label="反应史" prop="reaction_history" label-width="80px">
+                  <el-radio-group v-model="xkPatientInfo.reaction_history">
+                    <el-radio value="Y">有</el-radio>
+                    <el-radio value="N">无</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="移植配型史" prop="hasTransplantHistory">
-                  <el-radio-group v-model="formData.hasTransplantHistory">
-                    <el-radio :value="1">有</el-radio>
-                    <el-radio :value="0">无</el-radio>
+              <el-col :span="5">
+                <el-form-item label="移植配型史" prop="match_history" label-width="100px">
+                  <el-radio-group v-model="xkPatientInfo.match_history">
+                    <el-radio value="Y">有</el-radio>
+                    <el-radio value="N">无</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="妊娠史" prop="hasPregnancyHistory">
-                  <el-radio-group v-model="formData.hasPregnancyHistory">
-                    <el-radio :value="1">有</el-radio>
-                    <el-radio :value="0">无</el-radio>
+              <el-col :span="4">
+                <el-form-item label="妊娠史" prop="gestation_history" label-width="80px">
+                  <el-radio-group v-model="xkPatientInfo.gestation_history"
+                    :disabled="xkPatientInfo.patient_sex == '男' || (xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A')">
+                    <el-radio value="Y">有</el-radio>
+                    <el-radio value="N">无</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="分娩史" prop="hasDeliveryHistory">
-                  <el-radio-group v-model="formData.hasDeliveryHistory">
-                    <el-radio :value="1">有</el-radio>
-                    <el-radio :value="0">无</el-radio>
+              <el-col :span="4">
+                <el-form-item label="分娩史" prop="parturition_history" label-width="80px">
+                  <el-radio-group v-model="xkPatientInfo.parturition_history"
+                    :disabled="xkPatientInfo.patient_sex == '男' || (xkTransfuseApply.bill_stasus && xkTransfuseApply.bill_stasus != 'A')">
+                    <el-radio value="Y">有</el-radio>
+                    <el-radio value="N">无</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="申请类型" prop="hasDeliveryHistory">
-                  <el-radio-group v-model="formData.applyType">
-                    <el-radio :value="1">常规用血</el-radio>
-                    <el-radio :value="2">手术备血</el-radio>
-                    <el-radio :value="3">紧急</el-radio>
-                    <el-radio :value="4">大量</el-radio>
-                    <el-radio :value="5">紧急非同型</el-radio>
+                <el-form-item label="申请类型" prop="apply_type">
+                  <el-radio-group v-model="xkTransfuseApply.apply_type">
+                    <el-radio v-for="v in dictData.sqlx" :value="v.value">{{ v.label }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6">
-                <el-form-item label="单据类型" prop="type">
-                  <el-select v-model="formData.type">
-                    <el-option label="选项1" value="1" />
+              <el-col :span="5">
+                <el-form-item label="单据类型" prop="bill_type">
+                  <el-select v-model="xkTransfuseApply.bill_type">
+                    <el-option label="正常" value="正常" />
+                    <el-option label="补单" value="补单" />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="预定输血日期" prop="preTransfusionDate">
-                  <el-date-picker v-model="formData.preTransfusionDate" type="date" placeholder="选择日期" />
+              <el-col :span="18">
+                <el-form-item label="预定输血日期" prop="use1_date">
+                  <el-date-picker v-model="xkTransfuseApply.use1_date" type="datetime" placeholder="选择日期"
+                    value-format="YYYY-MM-DD HH:mm:ss" style="width:200px" />
                 </el-form-item>
               </el-col>
+              <el-col :span="24">
+                <el-row :gutter="10">
+                  <el-col :span="5">
+                    <el-form-item label="上级医师" prop="check_medic">
+                      <SelectTable v-model:data="xkTransfuseApply.check_medic" :tableData="userList" placeholder=""
+                        disabled size="small" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="7">
+                    <el-form-item label="审核时间" prop="medic_check_date">
+                      <el-date-picker v-model="xkTransfuseApply.medic_check_date" type="datetime" placeholder="选择日期"
+                        value-format="YYYY-MM-DD HH:mm:ss" style="width:200px" disabled />
+                    </el-form-item>
+
+                  </el-col>
+                  <el-col :span="8">
+                    <el-checkbox v-model="xkTransfuseApply.agreement_ink" true-value="Y" class="text-danger"
+                      false-value="N">病人/病人家属是否签署输血同意书</el-checkbox>
+                  </el-col>
+                </el-row>
+              </el-col>
             </el-row>
+
+            <div class="status"
+              :style="{ borderColor: getBillStatusInfo(xkTransfuseApply.bill_stasus).color, color: getBillStatusInfo(xkTransfuseApply.bill_stasus).color }">
+              {{ getBillStatusInfo(xkTransfuseApply.bill_stasus).label }}
+            </div>
           </div>
 
           <!-- 检查结果（添加单位后缀） -->
           <div class="box-item">
-            <div class="box-title">患者最近检查结果</div>
-            <el-row :gutter="10">
-              <el-col :span="6">
-                <el-form-item label="HGB" prop="hgb">
-                  <el-input v-model="formData.hgb">
-                    <template #suffix>g/L</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="HCT" prop="hct">
-                  <el-input v-model="formData.hct">
-                    <template #suffix>%</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="PLT" prop="plt">
-                  <el-input v-model="formData.plt">
-                    <template #suffix>×10^9/L</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="ALT" prop="alt">
-                  <el-input v-model="formData.alt">
-                    <template #suffix>U/L</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="HBsAg" prop="hbsag">
-                  <el-input v-model="formData.hbsag">
-                    <template #suffix>ng/ml</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="TP" prop="tp">
-                  <el-input v-model="formData.tp">
-                    <template #suffix>g/L</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="Anti-HCV" prop="antiHcv">
-                  <el-input v-model="formData.antiHcv">
-                    <template #suffix>S/CO</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="Anti-HIV" prop="antiHiv">
-                  <el-input v-model="formData.antiHiv">
-                    <template #suffix>S/CO</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="PT" prop="pt">
-                  <el-input v-model="formData.pt">
-                    <template #suffix>秒</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="APTT" prop="aptt">
-                  <el-input v-model="formData.aptt">
-                    <template #suffix>秒</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="FIB" prop="fib">
-                  <el-input v-model="formData.fib">
-                    <template #suffix>g/L</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="INR" prop="inr">
-                  <el-input v-model="formData.inr">
-                    <template #suffix>（无单位）</template>
-                  </el-input>
+            <div class="box-title">病人最近检查结果</div>
+            <el-row :gutter="20" style="padding-right: 30px;">
+              <el-col :span="6" v-for="item in lisProject" class="col-project">
+                <el-form-item :label="item.item_name">
+                  <el-select v-model="item.item_result" placeholder="">
+                    <el-option v-for="v in dictData.sxqjcxmmrz" :label="v.label" :value="v.value" />
+                  </el-select>
+                  <span class="unit">{{ item.item_unit }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
           </div>
 
           <!-- 血液品种 -->
-          <div class="box-item">
+          <div class="box-item" style="margin-bottom: 0;">
             <div class="box-title">
               <span>血液品种</span>
               <div class="title-btn">
                 <el-button type="primary" @click="openBloodDialog">增加</el-button>
               </div>
             </div>
-            <el-table :data="bloodList" border height="120">
-              <el-table-column prop="bloodType" label="血液品种" align="center" />
-              <el-table-column prop="volume" label="申请血量" align="center" />
+            <el-table :data="bloodList" border height="145" show-overflow-tooltip>
+              <el-table-column prop="blood_breed" label="血液品种" align="center">
+                <template #default="{ row }">
+                  {{bloodBreed.find(v => v.value == row.blood_breed).label}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="blood_num" label="申请血量" align="center" />
               <el-table-column prop="unit" label="单位" align="center" />
-              <el-table-column prop="perVolume" label="每次血量" align="center" />
-              <el-table-column prop="applyBloodType" label="申请血型" align="center" />
-              <el-table-column prop="transPurpose" label="输血目的" align="center" />
-              <el-table-column prop="transIndication" label="输血指征" align="center" />
-              <el-table-column label="操作" align="center" width="120">
+              <el-table-column prop="onetime_num" label="每次血量" align="center" />
+              <el-table-column prop="apply_bloodtype" label="申请血型" align="center">
+                <template #default="{ row }">
+                  {{ formatDict(row.apply_bloodtype, 'abotype') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="intent" label="输血目的" align="center" width="150">
+                <template #default="{ row }">
+                  {{ formatDict(row.intent, 'sxmd') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="causalis" label="输血指征" align="center">
+                <template #default="{ row }">
+                  {{ formatDict(row.causalis, 'sxzz') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="special_deal" label="特殊处理" align="center">
+                <template #default="{ row }">
+                  {{ formatDict(row.special_deal, 'sxzz') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="replace_bloodbreed" label="替代血液品种" align="center" width="120">
+                <template #default="{ row }">
+                  {{bloodBreed.find(v => v.value == row.replace_bloodbreed).label}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="remark" label="备注" align="center" />
+              <el-table-column label="操作" align="center" width="120" fixed="right">
                 <template #default="scope">
                   <el-button link type="primary" @click="editBlood(scope.row, scope.$index)">编辑</el-button>
                   <el-button link type="primary" @click="deleteSingleBlood(scope.$index)">删除</el-button>
@@ -348,31 +365,48 @@
       <div class="right-wrap">
         <div class="box-title">申请单列表</div>
         <div class="filter-bar">
-          <el-radio-group v-model="listScope" size="small">
-            <el-radio :value="0">当前病人</el-radio>
-            <el-radio :value="1">病人列表</el-radio>
-            <el-radio :value="2">当前医生</el-radio>
+          <el-radio-group v-model="listScope" size="small" @change="radioChange">
+            <el-radio value="1">当前病人</el-radio>
+            <el-radio value="2">本科室</el-radio>
+            <el-radio value="3">当前医生</el-radio>
           </el-radio-group>
           <div class="date-filter">
             <span>单据状态：</span>
-            <el-select v-model="filterStatus" style="width:110px" size="small">
-              <el-option label="全部" value="" />
+            <el-select v-model="queryForm.bill_status" style="width:110px" size="small" @change="getSqdList">
+              <el-option v-for="item in dictData.billApplyStatus" :label="item.label" :value="item.value" />
             </el-select>
-            <el-input-number v-model="filterDays" :min="1" :max="30" style="width:80px" class="ml10" size="small" />天内
+            <el-input v-model="queryForm.day" type="number" style="width:80px" class="ml10" size="small"
+              @keydown.enter="getSqdList" />天内
           </div>
         </div>
-        <el-table :data="orderList" border style="width:100%" height="calc(100vh - 260px)">
-          <el-table-column prop="name" label="血液品种" align="center" width="150" />
-          <el-table-column prop="applyBloodVolume" label="申请血量" align="center" />
-          <el-table-column prop="unit" label="单位" align="center" />
-          <el-table-column prop="perBloodVolume" label="每次血量" align="center" />
-          <el-table-column prop="applyBloodType" label="申请血型" align="center" />
-          <el-table-column prop="transPurpose" label="输血目的" align="center" width="150" />
-          <el-table-column prop="indication" label="输血指征" align="center" width="150" />
-          <el-table-column prop="specialTreatment" label="特殊处理" align="center" width="150" />
-          <el-table-column prop="alternativeBloodType" label="替代血液品种" align="center" width="150" />
-          <el-table-column prop="remark" label="备注" align="center" />
-        </el-table>
+        <div class="table-box">
+          <el-table ref="orderRef" :data="orderList" border style="width:100%" height="100%" :cell-style="cellStyle"
+            highlight-current-row show-overflow-tooltip @row-click="rowClick">
+            <el-table-column prop="bill_stasus" label="单据状态" align="center">
+              <template #default="scope">
+                {{ formatDict(scope.row.bill_stasus, 'billApplyStatus') }}
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="patient_name" label="姓名" align="center" />
+            <el-table-column prop="beinhos_id" label="住院号" align="center" />
+            <el-table-column prop="bill_no" label="申请单号" align="center" width="120" />
+            <el-table-column prop="dept_id" label="科室" align="center">
+              <template #default="scope">
+                {{ formatDict(scope.row.dept_id, 'ks') }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="abo_type" label="血型" align="center" />
+            <el-table-column prop="rh_type" label="Rh(D)" align="center" />
+            <el-table-column prop="req_breed" label="申请品种" align="center" />
+            <el-table-column prop="apply_date" label="申请日期" width="120" align="center" />
+            <el-table-column prop="apply_medic" label="申请医师" align="center">
+              <template #default="scope">
+                {{userList.find(item => item.value == scope.row.apply_medic)?.label || ''}}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
     </div>
 
@@ -381,48 +415,58 @@
       <el-form ref="bloodFormRef" :model="bloodForm" label-width="100px" :rules="bloodFormRules">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="血液品种" prop="bloodType">
-              <el-input v-model="bloodForm.bloodType" />
+            <el-form-item label="血液品种" prop="blood_breed">
+              <el-select v-model="bloodForm.blood_breed" placeholder="" @change="breedChange">
+                <el-option v-for="item in bloodBreed" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请血量" prop="volume">
-              <el-input v-model="bloodForm.volume" type="number" />
+            <el-form-item label="申请血量" prop="blood_num">
+              <el-input v-model="bloodForm.blood_num" type="number" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单位" prop="unit">
-              <el-input v-model="bloodForm.unit" />
+              <el-input v-model="bloodForm.unit" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="每次血量" prop="perVolume">
-              <el-input v-model="bloodForm.perVolume" type="number" />
+            <el-form-item label="每次血量" prop="onetime_num">
+              <el-input v-model="bloodForm.onetime_num" type="number" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请血型" prop="applyBloodType">
-              <el-input v-model="bloodForm.applyBloodType" />
+            <el-form-item label="申请血型" prop="apply_bloodtype">
+              <el-select v-model="bloodForm.apply_bloodtype" placeholder="">
+                <el-option v-for="item in dictData.abotype" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="输血目的" prop="transPurpose">
-              <el-input v-model="bloodForm.transPurpose" />
+            <el-form-item label="输血目的" prop="intent">
+              <el-select v-model="bloodForm.intent" placeholder="">
+                <el-option v-for="item in dictData.sxmd" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="输血指征" prop="transIndication">
-              <el-input v-model="bloodForm.transIndication" />
+            <el-form-item label="输血指征" prop="causalis">
+              <el-select v-model="bloodForm.causalis" placeholder="">
+                <el-option v-for="item in dictData.sxzz" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="特殊处理" prop="specialTreatment">
-              <el-input v-model="bloodForm.specialTreatment" placeholder="请输入特殊处理" />
+            <el-form-item label="特殊处理" prop="special_deal">
+              <el-input v-model="bloodForm.special_deal" placeholder="请输入特殊处理" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="替代血液品种" prop="alternativeBloodType">
-              <el-input v-model="bloodForm.alternativeBloodType" placeholder="请输入替代血液品种" />
+            <el-form-item label="替代血液品种" prop="replace_bloodbreed">
+              <el-select v-model="bloodForm.replace_bloodbreed" placeholder="">
+                <el-option v-for="item in bloodBreed" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -437,93 +481,500 @@
         <el-button @click="bloodDialogVisible = false">取消</el-button>
       </template>
     </el-dialog>
+
+    <el-dialog title="输血申请检索" v-model="visible" width="1000px" :close-on-click-modal="false" @closed="handleClose">
+      <div class="mb10">
+        <el-button type="primary" @click="handleSearch">检索</el-button>
+        <el-button type="success" @click="handleConfirm">确认</el-button>
+      </div>
+      <!-- 检索条件区 -->
+      <el-form :model="searchForm" label-width="auto" class="search-form">
+        <el-row :gutter="30">
+          <el-col :span="10">
+            <el-form-item label="申请日期">
+              <div class="date-range">
+                <el-date-picker v-model="searchForm.stime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                  style="width: 47%" />
+                <span class="separator" style="width: 6%;display: inline-block;text-align: center;">-</span>
+                <el-date-picker v-model="searchForm.etime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                  style="width: 47%" />
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="患者姓名">
+              <el-input v-model="searchForm.patient_name" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="患者科室">
+              <SelectTable v-model:data="searchForm.zone_id" :tableData="dictData.ks" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="10">
+            <el-form-item label="申请单号">
+              <el-input v-model="searchForm.bill_no" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="住院号/ID号">
+              <el-input v-model="searchForm.beinhos_id" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="单据状态">
+              <SelectTable v-model:data="searchForm.bill_status" :tableData="dictData.billApplyStatus" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 结果表格区 -->
+      <el-table :data="jsTabdeList" border style="width: 100%; margin-top: 10px" height="350" show-overflow-tooltip
+        @row-click="handleRowClick" highlight-current-row :cell-style="cellStyle">
+        <el-table-column prop="bill_stasus" label="单据状态" align="center">
+          <template #default="scope">
+            {{ formatDict(scope.row.bill_stasus, 'billApplyStatus') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="patient_name" label="姓名" align="center" />
+        <el-table-column prop="beinhos_id" label="住院号" align="center" />
+        <el-table-column prop="bill_no" label="申请单号" align="center" width="120" />
+        <el-table-column prop="dept_id" label="科室" align="center">
+          <template #default="scope">
+            {{ formatDict(scope.row.dept_id, 'ks') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="abo_type" label="血型" align="center" />
+        <el-table-column prop="rh_type" label="Rh(D)" align="center" />
+        <el-table-column prop="req_breed" label="申请品种" align="center" />
+        <el-table-column prop="apply_date" label="申请日期" width="120" align="center" />
+        <el-table-column prop="apply_medic" label="申请医师" align="center">
+          <template #default="scope">
+            {{userList.find(item => item.value == scope.row.apply_medic)?.label || ''}}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <el-dialog title="审核" v-model="shShow" width="350px" :close-on-click-modal="false" @closed="shClose">
+      <el-form ref="shFormRef" :model="shForm" label-width="auto">
+        <el-form-item label="上级医师">
+          <SelectTable v-model:data="shForm.checkMedic" :tableData="userList" placeholder="" />
+        </el-form-item>
+        <el-form-item label="审核时间">
+          <el-date-picker v-model="shForm.checkDate" type="datetime" placeholder="选择日期"
+            value-format="YYYY-MM-DD HH:mm:ss" style="width:100%" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" @click="handleSh">确定</el-button>
+        <el-button @click="shClose">取消</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="作废" v-model="zfShow" width="350px" :close-on-click-modal="false" @closed="() => {
+      reason = ''; reasonText = ''
+    }">
+      <DropdownTableSelect v-model="reasonText" :tableData="dictData.sqdzfyy" labelField="label"
+        :columnList="[{ label: '字典名称', prop: 'label' }, { label: '代号', prop: 'value' }]" placeholder="作废原因"
+        @change="(row) => { reason = row.value }" />
+      <template #footer>
+        <el-button type="primary" @click="handleZf">确定</el-button>
+        <el-button @click="zfShow = false">取消</el-button>
+      </template>
+    </el-dialog>
+    <!-- 审核意见弹窗 -->
+    <ReviewComments ref="reviewCommentsRef"
+      @success="() => { getQueryOneInfo(xkTransfuseApply.bill_no); getSqdList() }" />
+    <!-- 校验用户身份 -->
+    <CheckUser ref="checkUserRef" @onConfirm="handleCheckUserConfirm" />
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="Application">
 import type { ElForm, ElTable } from 'element-plus'
 import { ElMessageBox, ElMessage } from 'element-plus'
+import { getDictData, formatDict, dictData, useCommonDict, useSysParam } from '@/hooks'
+import DropdownTableSelect from '@/components/DropdownTableSelect/index.vue'
+import dayjs from 'dayjs'
+import {
+  querysqList, getPatInfo, checkSelfBlood, checkCausalis, savePreApplyInfo, saveApplyInfo, queryApplyOne,
+  queryApplyBeforeList, applyCheck, applyMedicCheck, cancelApplyMedicCheck, cancelApplyCheck, cancelApply
+} from '@/api/doctor/application'
+import { queryOperation, getDeptType, checkLoginAffirm } from '@/api/common'
+import ReviewComments from './component/reviewComments.vue'
+import CheckUser from '@/components/CheckUser/index.vue'
+import useUserStore from '@/store/modules/user'
+const userInfo = useUserStore()
 
-// 定义表单Ref
-const formRef = ref<InstanceType<typeof ElForm>>()
+// 解构全部公共变量与方法
+const { getParam } = useSysParam()
+
+const {
+  getServerTime,
+  userList,
+  getUserData,
+  bloodBreed,
+  getBloodList,
+  lisProject,
+  getLisProject,
+  diaList,
+  getDiaList,
+  loadAllDict
+} = useCommonDict()
+
+const route = useRoute()
+const saveLoading = ref(false)
 const bloodFormRef = ref<InstanceType<typeof ElForm>>()
-
-const formData = reactive({
-  applyNo: '',
-  applyDate: new Date(),
-  applyDoctor: '管理员',
-  attendingDoctor: '',
-  superiorDoctor: '',
-  hospitalNo: '',
-  name: '',
-  bloodType: '',
-  patient_sex: '',
-  age: '',
-  rhd: '',
-  dept: '',
-  ward: '',
-  bedNo: '',
-  deptType: '',
-  singleDisease: '',
-  diagnosis: '',
-  transPurpose: '',
-  transIndication: '',
-  hasTransfusionHistory: '0',
-  hasReactionHistory: '0',
-  hasTransplantHistory: '0',
-  hasPregnancyHistory: '0',
-  hasDeliveryHistory: '0',
-  operationName: '',
-  operationLevel: '',
-  signedConsent: true,
-  hgb: '',
-  hct: '',
-  plt: '',
-  alt: '',
-  hbsag: '',
-  tp: '',
-  antiHcv: '',
-  antiHiv: '',
-  pt: '',
-  aptt: '',
-  fib: '',
-  inr: ''
+const queryForm = reactive({
+  day: 7,
+  bill_status: '',
+  dept_code: userInfo.deptParam.deptId,
+  doctor_code: userInfo.name,
+  beinhos_id: ''
 })
 
+const listScope = ref('3')
+
+const radioChange = (val: string) => {
+  switch (val) {
+    case '1':
+      queryForm.beinhos_id = xkTransfuseApply.value.beinhos_id
+      queryForm.dept_code = ''
+      queryForm.doctor_code = ''
+      break;
+    case '2':
+      queryForm.dept_code = xkTransfuseApply.value.dept_id ? xkTransfuseApply.value.dept_id : userInfo.deptParam.deptId
+      queryForm.beinhos_id = ''
+      queryForm.doctor_code = ''
+      break;
+    case '3':
+      queryForm.doctor_code = userInfo.name
+      queryForm.dept_code = ''
+      queryForm.beinhos_id = ''
+      break;
+    default:
+      break;
+  }
+  getSqdList()
+}
+
+const pgcolumnList = ref([
+  { label: '住院号', prop: 'beinhos_id' },
+  { label: '姓名', prop: 'patient_name', width: 100 },
+  { label: '评估日期(24h内有效)', prop: 'assess_data', width: 200 },
+  { label: '评估人', prop: 'assess_person', width: 100 },
+  { label: '评估单号', prop: 'bill_no' },
+])
+
+const tableData = ref([])
+const dictList = ref([
+  { label: '代号', prop: 'value' },
+  { label: '字典', prop: 'label' }
+])
+
+const formData = ref({
+  apply_date: '',
+}) //申请单信息
+const xkPatientInfo = ref({
+  transfuse_history: 'N',
+  reaction_history: 'N',
+  match_history: 'N',
+  gestation_history: 'N',
+  parturition_history: 'N',
+  nldw: '岁',
+}) //病人信息
+const xkTransfuseApply = ref({
+  agreement_ink: 'Y',
+  bill_type: '正常',
+  apply_type: '001'
+}) //输血申请信息
+
+
+const sexChange = (val: string) => {
+  if (val == '男') {
+    xkPatientInfo.value.parturition_history = 'N'
+    xkPatientInfo.value.gestation_history = 'N'
+  }
+}
+
+
+
+// 根据单据状态获取单元格样式（背景色+白色文字）
+const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
+  console.log(row, column);
+
+  if (column.label == '单据状态') {
+    return {
+      background: `${getBillStatusInfo(row.bill_stasus).color} !important`,
+      color: '#ffffff',
+      fontWeight: 500
+    }
+  }
+
+}
+
+const getBillStatusInfo = (code: string) => {
+  // 兜底空数组，不存在字典时不执行find
+  const statusList = dictData.value?.billApplyStatus ?? []
+  const target = statusList.find(item => item.value == code)
+  if (target) {
+    return { label: target.label, color: target.remark }
+  }
+  // 未知状态兜底橙色
+  return { label: '未审核', color: '#E6A23C' }
+}
+
 // 血液品种列表
-const bloodList = ref([
-  { bloodType: '', volume: 'test1', unit: '', perVolume: '', applyBloodType: '', transPurpose: '', transIndication: '' }
-])
-
-const orderList = ref([
-  { status: '', name: 'test1', hospitalNo: '', applyNo: '', dept: '', bloodType: '', rhd: '', bloodTypeDetail: '', quantity: '', unit: '', applyDate: '', applyDoctor: '' }
-])
-
-const useBarcode = ref(false)
-const listScope = ref(0)
-const filterStatus = ref('')
-const filterDays = ref(3)
+const bloodList = ref([])
 
+const orderList = ref([]) // 输血申请单列表
+const orderRef = useTemplateRef('orderRef')
 // 血液品种弹窗相关
 const bloodDialogVisible = ref(false)
 const editIndex = ref(-1)
-const bloodForm = reactive({
-  bloodType: '',
-  volume: '',
-  unit: '',
-  perVolume: '',
-  applyBloodType: '',
-  transPurpose: '',
-  transIndication: ''
-})
+const bloodForm = reactive({})
 
 // 血液品种表单验证规则
 const bloodFormRules = reactive({
-  bloodType: [{ required: true, message: '请输入血液品种', trigger: 'blur' }],
-  volume: [{ required: true, message: '请输入申请血量', trigger: 'blur', type: 'number' }],
-  unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
-  applyBloodType: [{ required: true, message: '请输入申请血型', trigger: 'blur' }]
+  blood_breed: [{ required: true, message: '请输入血液品种', trigger: 'blur' }],
+  blood_num: [
+    { required: true, message: '请输入申请血量', trigger: 'blur' },
+    {
+      validator: (rule: any, value: number, callback: Function) => {
+        if (value <= 0) {
+          callback(new Error('申请血量必须大于0'))
+        } else {
+          callback()
+        }
+      },
+      trigger: 'blur'
+    }
+  ]
 })
+const visible = ref(false)
+const searchForm = ref({
+  stime: dayjs().format('YYYY-MM-DD'),
+  etime: dayjs().format('YYYY-MM-DD'),
+  patient_name: '',
+  bill_no: '',
+  beinhos_id: '',
+  bill_status: ''
+})
+const selectRow = ref({})
+const jsTabdeList = ref([])
+// 检索
+const openJsDialog = () => {
+  getList()
+  visible.value = true
+}
+const handleClose = () => {
+  visible.value = false
+  searchForm.value = {
+    stime: dayjs().format('YYYY-MM-DD'),
+    etime: dayjs().format('YYYY-MM-DD'),
+    patient_name: '',
+    bill_no: '',
+    beinhos_id: '',
+    bill_status: ''
+  }
+  selectRow.value = {}
+}
+const handleSearch = () => {
+  selectRow.value = {}
+  getList()
+}
+const handleConfirm = () => {
+  if (!selectRow.value.bill_no) return ElMessage.warning('请选择评估单')
+  getQueryOneInfo(selectRow.value.bill_no)
+  visible.value = false
+  selectRow.value = {}
+}
+
+const handleRowClick = (row) => {
+  selectRow.value = row
+}
+// 检索列表
+const getList = () => {
+  const data = {
+    ...searchForm.value,
+    stime: dayjs(searchForm.value.stime).format('YYYY-MM-DD') + ' 00:00:00',
+    etime: dayjs(searchForm.value.etime).format('YYYY-MM-DD') + ' 23:59:59',
+  }
+  querysqList(data).then((res) => {
+    jsTabdeList.value = res.data
+  })
+}
+
+// 查询申请单列表
+const getSqdList = () => {
+  querysqList(queryForm).then((res) => {
+    orderList.value = res.data
+    if (res.data.length) {
+      const row = res.data.find(item => item.bill_no == xkTransfuseApply.value.bill_no)
+      nextTick(() => {
+        if (row) {
+          orderRef.value.setCurrentRow(row)
+        }
+      })
+    }
+  })
+}
+
+const rowClick = (row) => {
+  getQueryOneInfo(row.bill_no)
+}
+//新增申请单
+const addHandle = () => {
+  xkPatientInfo.value = {
+    transfuse_history: 'N',
+    reaction_history: 'N',
+    match_history: 'N',
+    gestation_history: 'N',
+    parturition_history: 'N',
+    nldw: '岁',
+  } //病人信息
+  xkTransfuseApply.value = {
+    agreement_ink: 'Y',
+    bill_type: '正常',
+    apply_type: '001'
+  }
+  bloodList.value = []
+  formData.value = {
+    assess_bill_no: ''
+  }
+  getServerTime().then(time => {
+    formData.value.apply_date = time
+  })
+  getLisProject()
+}
+const checkUserRef = useTemplateRef('checkUserRef')
+const shShow = ref(false)
+const shForm = ref({
+  checkMedic: '',
+  checkDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  agreement_ink: 'Y'
+})
+const shLoading = ref(false)
+const reviewCommentsRef = useTemplateRef('reviewCommentsRef')
+// 审核
+// 如果是001 代表是临床科室，此时需要调用“上级医生审核” 审核接口，
+// 如果是002 代表是输血科室，调用“申请单审核前校验”
+const reviewHandle = () => {
+  if (!xkTransfuseApply.value.bill_no) return ElMessage.warning('请选择申请单')
+  shLoading.value = true
+  getDeptType({ userId: userInfo.name }).then(res => {
+    if (res.data == '001') {
+      shForm.value.checkMedic = userInfo.name
+      shShow.value = true
+    } else if (res.data = '002') {
+      applyCheck({ billNo: xkTransfuseApply.value.bill_no }).then(res => {
+        if (res.code == 0) {
+          reviewCommentsRef.value.open(res.data)
+        }
+      })
+    }
+  }).finally(() => {
+    shLoading.value = false
+  })
+}
+// 上级医生审核
+const handleSh = () => {
+  if (userInfo.name != shForm.value.checkMedic) {
+    //和当前登录的用户不一致的时候，需要输入工号密码验证
+    checkUserRef.value.open()
+  } else {
+    handleReviewConfirm()
+  }
+}
+
+const cancelreviewHandle = () => {
+  if (!xkTransfuseApply.value.bill_no) return ElMessage.warning('请选择申请单')
+  getDeptType({ userId: userInfo.name }).then(res => {
+    ElMessageBox.confirm(
+      `申请单号${xkTransfuseApply.value.bill_no}确定取消审核吗？`,
+      '提示',
+      { type: 'warning', }
+    ).then(() => {
+      if (res.data == '001') {
+        cancelApplyMedicCheck({ billNo: xkTransfuseApply.value.bill_no }).then(res => {
+          if (res.code == 0) {
+            ElMessage.success(res.msg)
+            getQueryOneInfo(xkTransfuseApply.value.bill_no)
+            getSqdList()
+          }
+        })
+      } else if (res.data == '002') {
+        cancelApplyCheck({ billNo: xkTransfuseApply.value.bill_no }).then(res => {
+          if (res.code == 0) {
+            ElMessage.success(res.msg)
+            getQueryOneInfo(xkTransfuseApply.value.bill_no)
+            getSqdList()
+          }
+        })
+      }
+    })
+  })
+}
+
+//作废
+const reason = ref('')
+const reasonText = ref('')
+const zfShow = ref(false)
+const invalidateHandle = () => {
+  // sqdzfyy
+  if (!xkTransfuseApply.value.bill_no) return ElMessage.warning('请选择申请单')
+  zfShow.value = true
+}
+const handleZf = () => {
+  if (!reason.value) return ElMessage.warning('请填写作废原因')
+  cancelApply({ billNo: xkTransfuseApply.value.bill_no, reason: reason.value }).then(res => {
+    if (res.code == 0) {
+      ElMessage.success(res.msg)
+      zfShow.value = false
+      getQueryOneInfo(xkTransfuseApply.value.bill_no)
+      getSqdList()
+    }
+  })
+}
+// 校验用户
+const handleCheckUserConfirm = (info: { yhdh: string, mm: string }) => {
+  checkLoginAffirm({ userId: info.yhdh, password: info.mm }).then((response: any) => {
+    if (response.code == 0) {
+      shForm.value.checkMedic = info.yhdh
+      handleReviewConfirm()
+    }
+  })
+}
+//输血科审核
+const handleReviewConfirm = () => {
+  const data = {
+    billNo: xkTransfuseApply.value.bill_no,
+    ...shForm.value
+  }
+  applyMedicCheck(data).then(res => {
+    if (res.code == 0) {
+      ElMessage.success(res.msg)
+      shShow.value = false
+      getQueryOneInfo(xkTransfuseApply.value.bill_no)
+      getSqdList()
+    }
+  })
+}
+
+//审核意见
+
+const shClose = () => {
+  shShow.value = false
+  shForm.value = {
+    checkMedic: '',
+    checkDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    agreement_ink: 'Y'
+  }
+}
 
 // 打开新增弹窗
 const openBloodDialog = () => {
@@ -537,45 +988,20 @@ const resetBloodForm = () => {
   if (bloodFormRef.value) {
     bloodFormRef.value.clearValidate()
   }
-  Object.assign(bloodForm, {
-    bloodType: '',
-    volume: '',
-    unit: '',
-    perVolume: '',
-    applyBloodType: '',
-    transPurpose: '',
-    transIndication: ''
-  })
+  // 删除所有key，清空表单
+  Object.keys(bloodForm).forEach(key => delete bloodForm[key])
 }
 
 // 编辑血液品种
 const editBlood = (row: any, index: number) => {
   editIndex.value = index
-  // 深拷贝行数据到表单
-  Object.assign(bloodForm, row)
+  // 清空原有表单
+  Object.keys(bloodForm).forEach(key => delete bloodForm[key])
+  // 深拷贝行数据再赋值，切断和表格原数据的引用
+  Object.assign(bloodForm, JSON.parse(JSON.stringify(row)))
   bloodDialogVisible.value = true
 }
 
-// 保存血液品种表单
-const saveBloodForm = async () => {
-  if (!bloodFormRef.value) return
-  try {
-    // 表单验证
-    await bloodFormRef.value.validate()
-    if (editIndex.value === -1) {
-      // 新增
-    } else {
-      // 编辑
-
-    }
-    bloodDialogVisible.value = false
-    ElMessage.success(editIndex.value === -1 ? '新增成功' : '编辑成功')
-  } catch (error) {
-    console.error('表单验证失败:', error)
-    ElMessage.error('请完善必填信息')
-  }
-}
-
 // 删除单条血液品种
 const deleteSingleBlood = (index: number) => {
   ElMessageBox.confirm(
@@ -588,52 +1014,223 @@ const deleteSingleBlood = (index: number) => {
   ).then(() => {
     bloodList.value.splice(index, 1)
     ElMessage.success('删除成功')
-  }).catch(() => {
-    ElMessage.info('已取消删除')
   })
 }
-
-// 批量删除（原删除按钮，保留）
-const deleteBlood = () => {
-  if (bloodList.value.length === 0) {
-    ElMessage.warning('暂无可删除的血液品种信息')
-    return
-  }
-  ElMessageBox.confirm(
-    '确定要删除最后一条血液品种信息吗？',
-    '提示',
-    {
-      type: 'warning',
-      size: 'small'
-    }
-  ).then(() => {
-    bloodList.value.pop()
-    ElMessage.success('删除成功')
-  }).catch(() => {
-    ElMessage.info('已取消删除')
-  })
+const breedChange = (value: string) => {
+  bloodForm.unit = bloodBreed.value.find(item => item.value === value)?.unit
 }
-
-// 可选：添加表单验证和提交方法
-const validateForm = async () => {
-  if (!formRef.value) return false
+// 保存血液品种表单
+const saveBloodForm = async () => {
+  if (!bloodFormRef.value) return
   try {
-    const valid = await formRef.value.validate()
-    return valid
-  } catch (err) {
-    console.error('表单验证失败:', err)
-    return false
+    await bloodFormRef.value.validate()
+    // 深拷贝一份再存入列表，防止双向联动
+    const formCopy = JSON.parse(JSON.stringify(bloodForm))
+    if (editIndex.value === -1) {
+      bloodList.value.push(formCopy)
+    } else {
+      bloodList.value.splice(editIndex.value, 1, formCopy)
+    }
+    bloodDialogVisible.value = false
+  } catch (error) {
+    ElMessage.error('请完善必填信息')
   }
 }
 
-const submitForm = async () => {
-  const isValid = await validateForm()
-  if (isValid) {
-    // 表单验证通过，执行提交逻辑
-    console.log('表单提交数据:', formData)
-    // 这里可以添加接口请求等逻辑
+
+const handleSubmit = async () => {
+  if (!bloodList.value.length) return ElMessage.error('请添加血液品种')
+  if (xkTransfuseApply.value.apply_type === '003' || xkTransfuseApply.value.apply_type === '002') {
+    if (!xkTransfuseApply.value.operation_name || !xkTransfuseApply.value.operation_level) {
+      return ElMessage.error('请完善手术名称、级别信息')
+    }
+  }
+  saveLoading.value = true
+  const tempPatient = { ...xkPatientInfo.value, beinhos_id: xkTransfuseApply.value.beinhos_id }
+
+  if (xkPatientInfo.value.age) {
+    tempPatient.age = xkPatientInfo.value.age + xkPatientInfo.value.nldw
+  }
+  const data = {
+    transfuseApplyInfoOne: {
+      xkPatientInfo: tempPatient,
+      xkTransfuseApply: xkTransfuseApply.value
+    },
+    xkTransfuseApplyBloodbreedList: bloodList.value,
+    xkTransfuseApplyTestitemList: lisProject.value,
+  }
+
+  checkSelfBlood({ beinhos_id: xkTransfuseApply.value.beinhos_id }).then((res) => {
+    if (res.code == 0) {
+      checkCausalis(data).then((res1) => {
+        if (res1.code == 0) {
+          savePreApplyInfo(data).then((res2) => {
+            if (res2.code == 0) {
+              saveApplyInfo(data).then((res3) => {
+                if (res3.code == 0) {
+                  ElMessage.success('保存成功')
+                  getSqdList()
+                }
+              })
+            } else if (res2.code == 1) {
+              getSqdList()
+              ElMessage.success(res2.msg)
+            } else if (res2.code == 2) {
+              //2 弹窗提示
+              ElMessageBox.confirm(res2.msg, '提示',
+                {
+                  confirmButtonText: '是',
+                  cancelButtonText: '否',
+                  type: 'warning',
+                  showClose: false,
+                  closeOnClickModal: false,
+                  closeOnPressEscape: false,
+                }
+              ).then(() => {
+                getQueryOneInfo(res2.data)
+              }).catch(() => {
+                saveApplyInfo(data).then((res3) => {
+                  if (res3.code == 0) {
+                    getSqdList()
+                    ElMessage.success('保存成功')
+                  }
+                })
+              })
+            }
+          })
+        }
+      })
+    }
+  }).finally(() => {
+    saveLoading.value = false
+  })
+
+}
+
+const getQueryOneInfo = (bill_no: string) => {
+  queryApplyOne({ billNo: bill_no }).then((res) => {
+    xkPatientInfo.value = res.data.transfuseApplyInfoOne.xkPatientInfo
+    xkTransfuseApply.value = res.data.transfuseApplyInfoOne.xkTransfuseApply
+    bloodList.value = res.data.xkTransfuseApplyBloodbreedList
+    formData.value = res.data.transfuseApplyInfoOne.xkTransfuseApply
+    lisProject.value = res.data.xkTransfuseApplyTestitemList.map(item => {
+      return {
+        bill_no: item.bill_no,
+        item_name: item.item_name,
+        item_result: item.item_result,
+        item_unit: item.item_unit,
+        test_date: item.test_date,
+        sid: item.sid
+      }
+    })
+
+    splitAge(xkPatientInfo.value.age)
+  })
+}
+
+
+const getInfo = (billNo) => {
+  //PJD2026061623
+  getPatInfo({ bill_no: billNo }).then((res) => {
+    xkPatientInfo.value = res.data.transfuseApplyInfoOne.xkPatientInfo
+    xkTransfuseApply.value = res.data.transfuseApplyInfoOne.xkTransfuseApply
+    formData.value = res.data.transfuseApplyInfoOne.xkTransfuseApply
+    lisProject.value = res.data.xkTransfuseApplyTestitemList.map(item => {
+      return {
+        bill_no: item.bill_no,
+        item_name: item.item_name,
+        item_result: item.item_result,
+        item_unit: item.item_unit,
+        test_date: item.test_date,
+        sid: item.sid
+      }
+    })
+
+    splitAge(xkPatientInfo.value.age)
+  })
+}
+
+// 回显时拆分 年龄 + 单位
+const splitAge = (ageStr: string) => {
+  const unitList = dictData.value.nldw.map(item => item.value)
+  let age = ageStr
+  let unit = '岁'
+  for (const u of unitList) {
+    if (ageStr.includes(u)) {
+      age = ageStr.replace(u, '')
+      unit = u
+      break
+    }
+  }
+  xkPatientInfo.value.age = age
+  xkPatientInfo.value.nldw = unit
+}
+
+
+
+const pgList = ref([])
+//获取评估申请单
+const getPgList = () => {
+  queryApplyBeforeList({ user_id: userInfo.name, dept_id: userInfo.deptParam.deptId }).then((res) => {
+    pgList.value = res.data
+  })
+}
+
+let needClearState = false // 标记是否需要清理state
+// 加载单据
+const loadBillInfo = () => {
+  const state = history.state as { billNo?: string; isJump?: boolean } | null
+  // 只有主动跳转带过来的参数才执行查询
+  if (state?.isJump && state.billNo) {
+    getInfo(state.billNo)
+    needClearState = true // 标记本次有跳转参数，页面销毁时清空
   }
 }
+//住院号点击
+const getPgInfo = (row) => {
+  getInfo(row.bill_no)
+}
+
+//手术名称
+const operationList = ref([])
+const operationColumn = [
+  { label: '手术代号', prop: 'icd_code' },
+  { label: '手术名称', prop: 'oper_name', width: 200 },
+  // { label: '手术级别', prop: 'oper_level' },
+]
+
+const getSxList = () => {
+  queryOperation({ pageNum: 1, pageSize: 99999 }).then(res => {
+    operationList.value = res.rows
+  })
+}
+
+onMounted(() => {
+  loadAllDict()
+  getServerTime().then(time => {
+    formData.value.apply_date = time
+  })
+  getSxList()
+  getDictData('sqdzfyy', 'rhtype', 'abotype', 'nldw', 'billApplyStatus', 'sd', 'ks', 'depttype', 'bq', 'sxmd', 'sxzz', 'sxqjcxmmrz', 'sqlx', 'lczd', 'xylx', 'operatype', 'nooperatype')
+  getSqdList()
+  loadBillInfo()
+
+  // SQDSFKRLXGXX 参数说明如下：
+  // 输血申请时是否可从HIS系统中调出患者信息，是否可以录入修改患者血型？
+  // 以"/"分隔，"/"前指可以调出患者信息时是否可以修改患者血型(Y可以修改N不可以修改)，
+  // "/"后指不可以调出患者信息时是否可以录入全部和只能录入"未知"患者血型(Y可以录入全部N只能录入"未知")
+  getParam('SQDSFKRLXGXX') //
+})
+
+// 监听路由变化
+watch(() => route.fullPath, loadBillInfo)
+
+// 页面关闭/切换标签时再清空state，不影响同路由二次跳转
+onBeforeUnmount(() => {
+  if (needClearState) {
+    history.replaceState({}, document.title)
+  }
+})
 </script>
 
 <style scoped lang="scss">
@@ -644,9 +1241,6 @@ const submitForm = async () => {
   overflow-y: auto;
 
   .toolbar {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 6px;
     padding: 8px;
     background: #fff;
     box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
@@ -700,6 +1294,11 @@ const submitForm = async () => {
 
       .blood-transfusion-form {
         width: 100%;
+
+        .el-radio {
+          margin-right: 10px !important;
+
+        }
       }
 
       .box-item {
@@ -708,12 +1307,39 @@ const submitForm = async () => {
         box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
         padding: 10px;
         margin-bottom: 10px;
+        position: relative;
 
         :deep(.el-form-item) {
           margin-bottom: 6px !important;
         }
 
+
+        .col-project {
+          position: relative;
+
+        }
+
+        .unit {
+          position: absolute;
+          left: 100%;
+          top: 0;
+          color: #aeb1b7;
+          margin-left: 5px;
+        }
+
+        .status {
+          position: absolute;
+          right: 20px;
+          top: 36px;
+          color: #409eff;
+          font-size: 18px;
+          font-weight: 700;
+          border: 2px solid #409eff;
+          border-radius: 5px;
+          padding: 10px;
+        }
       }
+
     }
 
     /* 右侧 1份 */
@@ -738,7 +1364,21 @@ const submitForm = async () => {
         font-size: 14px;
         color: #333;
       }
+
+      .table-box {
+        flex: 1;
+        overflow: hidden;
+      }
     }
   }
 }
+
+.text-danger {
+  color: #f00 !important;
+  margin-left: 20px;
+
+  :deep(.el-checkbox__label) {
+    color: #f00 !important;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/doctor/assessment/index.vue b/src/views/doctor/assessment/index.vue
index 68c6424..fef4feb 100644
--- a/src/views/doctor/assessment/index.vue
+++ b/src/views/doctor/assessment/index.vue
@@ -42,7 +42,7 @@
       </div>
       <!-- 基础信息 -->
       <div class="section">
-        <div class="title">基础信息</div>
+        <div class="title">患者信息</div>
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="住院号/ID号">
@@ -228,10 +228,10 @@
       </el-form>
 
       <!-- 结果表格区 -->
-      <el-table :data="tableData" border style="width: 100%; margin-top: 10px" height="350" @row-click="handleRowClick"
-        highlight-current-row>
-        <el-table-column prop="bill_no" label="评估单号" align="center" width="180" />
-        <el-table-column prop="dept_id" label="科室" align="center">
+      <el-table :data="tableData" border style="width: 100%; margin-top: 10px" show-overflow-tooltip height="350"
+        @row-click="handleRowClick" highlight-current-row>
+        <el-table-column prop="bill_no" label="评估单号" align="center" width="150" />
+        <el-table-column prop="dept_id" label="科室" align="center" width="160">
           <template #default="scope">
             {{ formatDict(scope.row.dept_id, 'ks') }}
           </template>
@@ -304,11 +304,11 @@ const handleSearch = () => {
   getList()
 }
 const handleConfirm = () => {
-  if (!seelctRow.value.bill_no) return ElMessage.warning('请选择评估单')
-  evaluationInfo.value.billNo = seelctRow.value.bill_no
+  if (!selectRow.value.bill_no) return ElMessage.warning('请选择评估单')
+  evaluationInfo.value.billNo = selectRow.value.bill_no
   getBillInfo()
   visible.value = false
-  seelctRow.value = {}
+  selectRow.value = {}
 }
 
 const handleClose = () => {
@@ -320,7 +320,7 @@ const handleClose = () => {
     bill_no: '',
     beinhos_id: ''
   }
-  seelctRow.value = {}
+  selectRow.value = {}
 }
 
 //获取评估单信息
@@ -333,7 +333,7 @@ const getBillInfo = () => {
       lisProject.value = res.data.xkTransfuseApplyTestitemList.map(item => {
         return {
           bill_no: item.bill_no,
-          item_name: item.pro_name,
+          item_name: item.item_name,
           item_result: item.item_result,
           item_unit: item.item_unit,
           test_date: item.test_date,
@@ -361,9 +361,9 @@ const splitAge = (ageStr: string) => {
   baseInfo.value.nldw = unit
 }
 
-const seelctRow = ref({})
+const selectRow = ref({})
 const handleRowClick = (row) => {
-  seelctRow.value = row
+  selectRow.value = row
 }
 //查询单据信息
 const getList = () => {
@@ -441,14 +441,14 @@ const handleSubmit = () => {
   }
   if (bloodInfo.value.bill_status && bloodInfo.value.bill_status == '1') {
     updatePat(data).then((res) => {
-      saveLoading.value = false
       if (res.code == 0) {
         ElMessage.success('保存成功')
       }
+    }).finally(() => {
+      saveLoading.value = false
     })
   } else {
     savePat(data).then((res) => {
-      saveLoading.value = false
       if (res.code == 0) {
         ElMessage.success('保存成功')
         evaluationInfo.value.billNo = res.data
@@ -456,6 +456,8 @@ const handleSubmit = () => {
         //获取到评估单号后请求最新评估单信息
         getBillInfo()
       }
+    }).finally(() => {
+      saveLoading.value = false
     })
   }
 
@@ -463,7 +465,12 @@ const handleSubmit = () => {
 }
 
 const goSxPath = () => {
-  router.push({ path: `/doctor/application` })
+  const billNo = evaluationInfo.value.billNo.trim()
+  // 额外添加标识 isJump 区分是主动跳转携带的参数
+  router.push({
+    name: 'Application',
+    state: { billNo, isJump: true }
+  })
 }
 
 const getProject = () => {
@@ -513,7 +520,7 @@ onMounted(() => {
   background: #fff;
   border-radius: 4px;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
-  padding: 12px;
+  padding: 10px;
   margin-bottom: 10px;
 
   .title {
diff --git a/src/views/doctor/autologous/index.vue b/src/views/doctor/autologous/index.vue
new file mode 100644
index 0000000..9f17527
--- /dev/null
+++ b/src/views/doctor/autologous/index.vue
@@ -0,0 +1,17 @@
+/**
+* @file index.vue
+* @description: 储存室自体血登记
+* @author: w
+* @since: 2026-07-08
+*/
+<template>
+  <div>
+    储存室自体血登记
+  </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/doctor/treatment/index copy.vue b/src/views/doctor/treatment/index copy.vue
new file mode 100644
index 0000000..098d9cd
--- /dev/null
+++ b/src/views/doctor/treatment/index copy.vue	
@@ -0,0 +1,313 @@
+/**
+* @file index.vue
+* @description: 输血治疗登记
+* @author: w
+* @since: 2026-07-08
+*/
+<template>
+  <div class="box-container">
+    <div class="toolbar">
+      <el-button type="primary" plain>检索</el-button>
+      <el-button type="primary" plain>新增单据</el-button>
+      <el-button type="danger" plain>删除单据</el-button>
+      <el-button type="success" plain>保存</el-button>
+      <el-button type="warning" plain>审核</el-button>
+      <el-button type="warning" plain>打印</el-button>
+      <el-button type="info" plain>标签重打</el-button>
+    </div>
+    <el-form label-width="auto">
+      <div class="section">
+        <div class="section-title">申请信息</div>
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item label="申请单号">
+              <DropdownTableSelect v-model="form.beinhos_id" :columnList="sqcolumnList" :tableData="sqList"
+                tableWidth="300px" labelField="beinhos_id" :showSearch="false" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="住院号/ID号">
+              <el-input v-model="form.patientId" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="姓 名">
+              <el-input v-model="form.patientName" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="性 别">
+              <el-select v-model="form.sex" placeholder="" readonly>
+                <el-option label="男" value="男" />
+                <el-option label="女" value="女" />
+                <el-option label="未知" value="未知" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="血 型">
+              <el-input v-model="form.bloodType" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item label="科 室">
+              <SelectTable v-model:data="form.deptId" :tableData="dictData.ks" placeholder="" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="申请日期">
+              <el-date-picker v-model="form.applyDate" type="datetime" style="width: 100%"
+                value-format="YYYY-MM-DD HH:mm:ss" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="治疗日期">
+              <el-date-picker v-model="form.treatDate" type="datetime" style="width: 100%"
+                value-format="YYYY-MM-DD HH:mm:ss" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年 龄">
+              <div>
+                <el-input v-model="form.age" readonly />
+                <!-- <el-select v-model="form.nldw" placeholder="" style="width: 45%">
+                  <el-option v-for="v in dictData.nldw" :label="v.label" :value="v.value" />
+                </el-select> -->
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="Rh(D)">
+              <el-input v-model="form.rh" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item label="是否采血">
+              <el-checkbox v-model="form.collectBlood" true-value="Y" false-value="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="输血史">
+              <el-checkbox v-model="form.transfusionHistory" true-value="Y" false-value="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="输血反应史">
+              <el-checkbox v-model="form.transfusionReactionHistory" true-value="Y" false-value="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="妊娠史">
+              <el-checkbox v-model="form.pregnancyHistory" true-value="Y" false-value="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="分娩史">
+              <el-checkbox v-model="form.deliveryHistory" true-value="Y" false-value="N" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <el-row :gutter="10">
+      <el-col :span="12">
+        <div class="box-item">
+          <div class="box-title">治疗项目</div>
+          <div class="table-box">
+            <el-table :data="treatmentItems" border height="150" style="width: 100%" show-overflow-tooltip
+              highlight-current-row>
+              <el-table-column prop="project" label="治疗项目" align="center" />
+              <el-table-column prop="quantity" label="数量" align="center" />
+              <el-table-column prop="unit" label="单位" align="center" />
+              <el-table-column prop="remark" label="备注" align="center" />
+            </el-table>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="box-item">
+          <div class="box-title">采血血液</div>
+          <div class="table-box">
+            <el-table :data="bloodItems" border height="150" style="width: 100%" show-overflow-tooltip
+              highlight-current-row>
+              <el-table-column prop="bloodBreed" label="血液品种" align="center" />
+              <el-table-column prop="volume" label="容量" align="center" />
+              <el-table-column prop="unit" label="单位" align="center" />
+              <el-table-column prop="remark" label="备注" align="center" />
+            </el-table>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <div class="section">
+      <div class="section-title">登记信息</div>
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-form-item label="治 疗 人">
+            <SelectTable v-model:data="registerInfo.apply_medic" :tableData="userList" placeholder="" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="治疗日期">
+            <el-date-picker v-model="registerInfo.treatDate" type="datetime" style="width: 100%"
+              value-format="YYYY-MM-DD HH:mm:ss" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="治疗不良反应">
+            <el-input v-model="registerInfo.adverseReaction" placeholder="双击选择" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="不良反应处理">
+            <el-input v-model="registerInfo.adverseHandle" placeholder="双击选择" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div class="section">
+      <div class="section-title">采血信息</div>
+      <div class="table-box">
+        <el-button type="primary" plain class="mb10">新增血液</el-button>
+        <el-table :data="bloodRecords" border height="220" style="width: 100%">
+          <el-table-column prop="bloodBreed" label="血液品种" align="center" />
+          <el-table-column prop="bloodType" label="血型" align="center" />
+          <el-table-column prop="rh" label="Rh(D)" align="center" />
+          <el-table-column prop="volume" label="容量" align="center" />
+          <el-table-column prop="unit" label="单位" align="center" />
+          <el-table-column label="操作" align="center">
+            <template #default="{ row }">
+              <el-button type="primary" text plain>删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import DropdownTableSelect from '@/components/DropdownTableSelect/index.vue'
+import { getDictData, formatDict, dictData, useCommonDict, useSysParam } from '@/hooks'
+
+const { userList, getUserData } = useCommonDict()
+const form = reactive({})
+const sqcolumnList = ref([
+  { label: '申请单编号', prop: 'sqbh' },
+  { label: '姓名', prop: 'name' },
+])
+const sqList = ref([])
+const treatmentItems = ref([])
+
+const bloodItems = ref([])
+
+const registerInfo = reactive({
+  treatPerson: '',
+  treatDate: '',
+  adverseReaction: '',
+  adverseHandle: ''
+})
+
+const bloodRecords = ref([])
+
+onMounted(() => {
+  getUserData()
+  getDictData('ks', 'nldw')
+})
+</script>
+
+<style scoped lang="scss">
+.box-container {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  gap: 10px;
+  overflow-y: auto;
+}
+
+.toolbar {
+  padding: 8px;
+  background: #fff;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+  border-radius: 4px;
+}
+
+.section {
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+  padding: 10px;
+}
+
+.el-form-item {
+  margin-bottom: 6px;
+
+  :deep(.el-form-item__label) {
+    font-weight: 700;
+  }
+}
+
+.section-title {
+  font-size: 15px;
+  font-weight: 700;
+  position: relative;
+  padding-left: 14px;
+  padding-bottom: 6px;
+}
+
+.section-title::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 4px;
+  width: 4px;
+  height: 16px;
+  border-radius: 0 4px 4px 0;
+  background-color: #409eff;
+}
+
+.box-item {
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+  padding: 12px;
+}
+
+.box-title {
+  font-size: 15px;
+  font-weight: 700;
+  margin-bottom: 12px;
+  position: relative;
+  padding-left: 14px;
+}
+
+.box-title::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 4px;
+  width: 4px;
+  height: 16px;
+  border-radius: 0 4px 4px 0;
+  background-color: #409eff;
+}
+
+
+.age-input {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.text-danger {
+  color: #f00 !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/doctor/treatment/index.vue b/src/views/doctor/treatment/index.vue
new file mode 100644
index 0000000..77a6023
--- /dev/null
+++ b/src/views/doctor/treatment/index.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>
+    输血治疗登记
+  </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/liswork/dict/index.vue b/src/views/liswork/dict/index.vue
index feba2e4..02ac8a4 100644
--- a/src/views/liswork/dict/index.vue
+++ b/src/views/liswork/dict/index.vue
@@ -238,6 +238,7 @@ function reset() {
   form.value = {
     wordbook_sign: '',
     wordbook_name: '',
+    wordbook_code_old: '',
     wordbook_code: '',
     use_sign: "Y",
     remark: undefined
@@ -268,6 +269,7 @@ function handleAdd() {
 function handleUpdate(row) {
   reset()
   form.value = row.wordbook_sign ? JSON.parse(JSON.stringify(row)) : info.value
+  form.value.wordbook_code_old = row.wordbook_code
   open.value = true;
   title.value = '编辑字典';
 }