diff --git a/src/api/blood/index.ts b/src/api/blood/index.ts index bb3222b..19b75e2 100644 --- a/src/api/blood/index.ts +++ b/src/api/blood/index.ts @@ -31,4 +31,101 @@ export function deleteBillNo(query?: Object) { method: 'get', params: query }) -} \ No newline at end of file +} +// 标本接收 +export function acceptSampleInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/acceptSampleInfo/acceptSampleInfo', + method: 'post', + data: query + }) +} +// 标本退回 +export function backSampleInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/acceptSampleInfo/backSampleInfo', + method: 'post', + data: query + }) +} +// 取消标本接收 +export function cancelSampleInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/acceptSampleInfo/cancelSampleInfo', + method: 'get', + params: query + }) +} +// 标本列表查询 +export function queryAcceptSampleList(query?: Object) { + return request({ + url: '/bus/bloodbank/acceptSampleInfo/queryList', + method: 'get', + params: query + }) +} +// 查询单个标本信息 +export function queryAcceptSampleOneInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/acceptSampleInfo/queryOne', + method: 'get', + params: query + }) +} +// 查询单据详情 +export function queryBloodOne(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/queryOne', + method: 'get', + params: query + }) +} +// 获取待血型复核的单据 +export function queryCheckBloodTypeInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/queryCheckBloodTypeInfo', + method: 'get', + params: query + }) +} +// 查询血型复核历史记录 +export function queryHistoryInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/queryHistoryInfo', + method: 'get', + params: query + }) +} +// 删除数据 +export function delCheckBloodTypeInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/delCheckBloodTypeInfo', + method: 'get', + params: query + }) +} +// 保存数据 +export function saveData(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/saveData', + method: 'post', + data: query + }) +} +// 检索血型复核记录 +export function jsqueryList(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/queryList', + method: 'get', + params: query + }) +} +// 查询单个血型复核单据详情 +export function queryOneInfo(query?: Object) { + return request({ + url: '/bus/bloodbank/checkBloodType/queryOneInfo', + method: 'get', + params: query + }) +} + diff --git a/src/api/nurses/index.ts b/src/api/nurses/index.ts index 7985bb3..facd048 100644 --- a/src/api/nurses/index.ts +++ b/src/api/nurses/index.ts @@ -15,4 +15,29 @@ export function printBarCode(query?: Object) { method: 'get', params: query }) -} \ No newline at end of file +} +// 标本送检 +export function sendSampleInfo(query?: Object) { + return request({ + url: '/bus/nurse/sendSampleInfo/sendSampleInfo', + method: 'get', + params: query + }) +} +// 查询单个样本信息 +export function queryOne(query?: Object) { + return request({ + url: '/bus/nurse/sendSampleInfo/queryOne', + method: 'get', + params: query + }) +} +// 查询样本信息列表 +export function queryYbList(query?: Object) { + return request({ + url: '/bus/nurse/sendSampleInfo/queryList', + method: 'get', + params: query + }) +} + diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 3730c51..d411477 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -850,6 +850,10 @@ aside { } } +.el-checkbox__input.is-disabled+span.el-checkbox__label { + color: #606266 !important; +} + // 一行省略 .ellipsis-one-line { white-space: nowrap; diff --git a/src/components/DropdownTableSelect/index.vue b/src/components/DropdownTableSelect/index.vue index d6a346c..4e0e4d0 100644 --- a/src/components/DropdownTableSelect/index.vue +++ b/src/components/DropdownTableSelect/index.vue @@ -28,7 +28,11 @@ :tooltip-config="{ appendToBody: true, zIndex: 3000 }" :show-overflow="true" :scroll-y="{ enabled: true, rSize: 30, height: '100%', oSize: 20, gt: 30, }"> + :title="field.label" align="center" :width="field.width" min-width="100"> + + @@ -46,7 +50,8 @@ export interface TableColumnItem { label: string prop: string width?: string - align?: 'left' | 'center' | 'right' + align?: 'left' | 'center' | 'right', + slotName?: string } export type TableRowItem = Record @@ -185,7 +190,7 @@ const filterDataHandle = () => { } }; -//搜索框上下回车键盘事件 ========== +//搜索框上下回车键盘事件 const handleInputKeydown = (e: KeyboardEvent) => { if (!['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) return; e.stopPropagation(); @@ -204,7 +209,7 @@ const handleInputKeydown = (e: KeyboardEvent) => { } }; -//表格容器上下键导航 ========== +//表格容器上下键导航 const handleTableKeydown = (e: KeyboardEvent) => { if (!['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) return; e.preventDefault(); @@ -222,7 +227,7 @@ const handleTableKeydown = (e: KeyboardEvent) => { } }; -// ========== 监听原始表格数据变化，重新生成拼音数据 ========== +// 监听原始表格数据变化，重新生成拼音数据 watch( () => props.tableData, (newVal) => { @@ -233,7 +238,6 @@ watch( { deep: true, immediate: true } ) -// 原有监听逻辑不变 watch( () => props.modelValue, (val) => { @@ -245,14 +249,14 @@ watch(inputText, (val) => { emit('update:modelValue', val) }) -// 输入框回车（原有逻辑） +// 输入框回车 const handleInputEnter = (e: KeyboardEvent) => { e.stopPropagation() emit('update:modelValue', inputText.value) emit('search', inputText.value) } -// 切换下拉框（修改：打开时聚焦搜索框、刷新过滤） +// 切换下拉框 const toggleDropdown = () => { if (!dropdownRef.value) return showPanel.value = !showPanel.value @@ -274,7 +278,7 @@ const toggleDropdown = () => { } } -// 表格行点击（原有逻辑完全不变） +// 表格行点击 const handleRowClick = (params: { row: TableRowItem }) => { const text = params.row[bindField] ?? '' inputText.value = text diff --git a/src/layout/index.vue b/src/layout/index.vue index 234eaa0..7f957df 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -34,6 +34,7 @@ const GLOBAL_PARAM_KEYS = [ 'HZBQGY', // 患者病情概要是否必填 'SQDSFKRLXGXX',//输血申请时是否可从HIS系统中调出患者信息，是否可以录入修改患者血型？以"/"分隔，"/"前指可以调出患者信息时是否可以修改患者血型(Y可以修改N不可以修改)，"/"后指不可以调出患者信息时是否可以录入全部和只能录入"未知"患者血型(Y可以录入全部N只能录入"未知") 'JSSJSFXG', //申请扫描登记 录入时间是否允许修改 + 'BBSJRMRDLR', //标本送检人是否默认为当前登录人 ] const settingsStore = useSettingsStore() diff --git a/src/permission.ts b/src/permission.ts index 0c19318..7092f70 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' import useUserStore from '@/store/modules/user' import useSettingsStore from '@/store/modules/settings' import usePermissionStore from '@/store/modules/permission' - +import { useDynamicTitle } from '@/utils/dynamicTitle' NProgress.configure({ showSpinner: false }) const whiteList = ['/login', '/register'] @@ -65,5 +65,6 @@ router.beforeEach((to, from, next) => { }) router.afterEach(() => { + useDynamicTitle() NProgress.done() }) diff --git a/src/utils/dynamicTitle.ts b/src/utils/dynamicTitle.ts index 66a503a..fd5b7a2 100644 --- a/src/utils/dynamicTitle.ts +++ b/src/utils/dynamicTitle.ts @@ -5,10 +5,7 @@ import useSettingsStore from '@/store/modules/settings' * 动态修改标题 */ export function useDynamicTitle(): void { - const settingsStore = useSettingsStore() - if (settingsStore.dynamicTitle) { - document.title = settingsStore.title + ' - ' + defaultSettings.title - } else { - document.title = defaultSettings.title - } + const settingsStore = useSettingsStore(); + const baseTitle = settingsStore.appTitle || defaultSettings.title; + document.title = baseTitle; } diff --git a/src/views/blood/acceptSample/index.vue b/src/views/blood/acceptSample/index.vue new file mode 100644 index 0000000..2557878 --- /dev/null +++ b/src/views/blood/acceptSample/index.vue @@ -0,0 +1,428 @@ +/** +* @file index.vue +* @description: 标本接收 +* @author: w +* @since: 2026-08-05 +*/ + + + + + + \ No newline at end of file diff --git a/src/views/blood/recheck/index.vue b/src/views/blood/recheck/index.vue index 4d7c08e..f01c862 100644 --- a/src/views/blood/recheck/index.vue +++ b/src/views/blood/recheck/index.vue @@ -10,46 +10,64 @@
检索 - 新增 - 删除 - 保存 + 新增 + 删除 + 保存 打印 - 血型复核历史查询 + 血型复核历史查询
- +
+
+ {{ getBillStatusInfo(form.bill_stasus).label }} +
紧急 是否紧急配血 - 是否特殊血型 + 是否特殊血型 保存后打印
+
+
申请信息
+
+ 血型复核单号：{{ xkCheckBloodtype.bill_no }} +
+
-
申请信息
- + + + + - + - + - + @@ -57,22 +75,22 @@ - + - + - + - + @@ -80,18 +98,17 @@ - + - + - - + @@ -99,13 +116,13 @@ - + - + @@ -115,25 +132,46 @@
- 输血反应史 - 输血史 - 分娩史 - 妊娠史 - 配型史 + 输血反应史 + 输血史 + 分娩史 + 妊娠史 + 配型史
- - - - - - - - + + + + + + + + + + + + + + + + + +
+
@@ -142,27 +180,39 @@
- - 清空 + + + +
- - 清空 + + + +
- + + + - + + + @@ -170,45 +220,60 @@ - + + + - + + + - - + + + + + - + - - + + + + - + + + - + + + - + @@ -216,17 +281,19 @@ - + - + + + - + @@ -236,8 +303,8 @@
- - +
检索 确认 @@ -245,7 +312,7 @@ - +
- + - + - + - + - + - - + + - - - - - - + + + + + + + + + + + + + + + +
+ 检索 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/views/nurses/specimenEntry/index.vue b/src/views/nurses/specimenEntry/index.vue index 3e4d4be..a4046de 100644 --- a/src/views/nurses/specimenEntry/index.vue +++ b/src/views/nurses/specimenEntry/index.vue @@ -7,7 +7,7 @@