Compare commits

..

No commits in common. "72dcbd0ff672ac86486b7a2de25b120087ced8ea" and "797cdeaa752cf9444f18e941584ee7479b346671" have entirely different histories.

11 changed files with 198 additions and 472 deletions

View File

@ -95,12 +95,12 @@
} }
.el-form--inline .el-form-item { .el-form--inline .el-form-item {
margin-right: .9375rem; margin-right: 15px;
} }
.el-form-item__label { .el-form-item__label {
font-weight: 400; font-weight: 400;
font-size: .875rem; font-size: 14px;
color: #08355E; color: #08355E;
} }
@ -117,7 +117,7 @@
.el-table { .el-table {
padding: 0 !important; padding: 0 !important;
border-radius: .625rem !important; border-radius: 10px !important;
.el-table__header-wrapper, .el-table__header-wrapper,
.el-table__fixed-header-wrapper { .el-table__fixed-header-wrapper {
@ -125,8 +125,8 @@
word-break: break-word; word-break: break-word;
background-color: #1F6DD3 !important; background-color: #1F6DD3 !important;
color: #FFF; color: #FFF;
height: 1.875rem !important; height: 30px !important;
font-size: .8125rem; font-size: 13px;
} }
} }
@ -251,7 +251,7 @@
border: 1px solid #96B8D9 !important; border: 1px solid #96B8D9 !important;
border-top: none !important; border-top: none !important;
/* 蓝色外边框 */ /* 蓝色外边框 */
border-radius: .5rem; border-radius: 8px;
/* 可选:添加边框圆角 */ /* 可选:添加边框圆角 */
overflow: hidden; overflow: hidden;
} }
@ -261,10 +261,10 @@
word-break: break-word; word-break: break-word;
background-color: #1F6DD3 !important; background-color: #1F6DD3 !important;
color: #FFF; color: #FFF;
height: 1.875rem !important; height: 30px !important;
line-height: 1.875rem !important; line-height: 30px !important;
padding: 0 !important; padding: 0 !important;
font-size: .8125rem; font-size: 13px;
border-color: #1F6DD3 !important; border-color: #1F6DD3 !important;
} }
@ -277,12 +277,12 @@
} }
.vxe-table--render-default .vxe-body--column { .vxe-table--render-default .vxe-body--column {
height: 1.4375rem !important; height: 23px !important;
line-height: 1.4375rem !important; line-height: 23px !important;
} }
.el-checkbox { .el-checkbox {
height: 1.4375rem !important; height: 23px !important;
} }
} }
@ -302,8 +302,8 @@
// 滚动条 // 滚动条
.mytable-style ::-webkit-scrollbar { .mytable-style ::-webkit-scrollbar {
width: .5rem; width: 8px;
height: .5rem; height: 8px;
} }
.mytable-style ::-webkit-scrollbar-thumb { .mytable-style ::-webkit-scrollbar-thumb {
@ -343,9 +343,8 @@
box-shadow: none !important; box-shadow: none !important;
} }
} }
.el-select__wrapper { .el-select__wrapper {
box-shadow: none; box-shadow: none;
background: transparent !important; background: transparent !important;
padding: 0 !important; padding: 0 !important;
outline: none; outline: none;
@ -359,10 +358,10 @@
/** 表单布局 **/ /** 表单布局 **/
.form-header { .form-header {
font-size: .9375rem; font-size: 15px;
color: #6379bb; color: #6379bb;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
margin: .5rem .625rem 1.5625rem .625rem; margin: 8px 10px 25px 10px;
padding-bottom: 5px padding-bottom: 5px
} }

View File

@ -1,185 +0,0 @@
<template>
<div class="context-menu-wrapper" @contextmenu.prevent="handleContextMenu($event)">
<!-- 插槽:包裹需要绑定右键菜单的内容 -->
<slot />
<!-- 右键菜单 -->
<div v-if="visible" class="hospital-menu" :style="{
top: `${top}px`,
left: `${left}px`,
display: visible ? 'block' : 'none',
width: `${menuWidth}px`
}" @click.stop @contextmenu.prevent>
<template v-for="(item, index) in items" :key="index">
<div v-if="item.type === 'divider'" class="menu-divider"></div>
<div v-if="item.type !== 'divider'" class="menu-item" :class="{
danger: item.danger,
disabled: item.disabled
}" @click="handleItemClick(item)">
<span class="menu-shortcut" v-if="item.shortcut">{{ item.shortcut }}</span>
<span class="menu-label">{{ item.label }}</span>
</div>
</template>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, onUnmounted, computed } from 'vue';
import { ContextMenuItem } from '@/types/index';
import emitter from '@/utils/mitt';
// 组件Props
const props = withDefaults(defineProps<{
items: ContextMenuItem[];
autoClose?: boolean;
menuWidth?: number | string;
}>(), {
autoClose: true,
menuWidth: 180,
});
// 组件Emits
const emit = defineEmits<{
(e: 'select', item: ContextMenuItem): void;
(e: 'open'): void;
(e: 'close'): void;
}>();
// 菜单状态
const visible = ref(false);
const top = ref(0);
const left = ref(0);
const handleContextMenu = (e: MouseEvent) => {
// 打开当前菜单关闭其他菜单
emitter.emit('closeAllContextMenus');
top.value = Math.min(e.clientY, window.innerHeight - 200);
left.value = Math.min(e.clientX, window.innerWidth - 200);
visible.value = true;
emit('open');
};
// 处理菜单项点击
const handleItemClick = (item: ContextMenuItem) => {
if (item.disabled) return;
emit('select', item);
if (props.autoClose !== false) {
hideMenu();
}
};
// 隐藏菜单
const hideMenu = () => {
if (visible.value) {
visible.value = false;
emit('close');
}
};
// 点击外部区域关闭菜单
const handleClickOutside = (e: MouseEvent) => {
hideMenu();
};
// 键盘事件处理
const handleKeyDown = (e: KeyboardEvent) => {
// console.log('e==>', e);
if (e.key === 'Escape') {
hideMenu();
}
if (e.key === 'e' && visible.value) {
console.log('e==>', e);
}
};
onMounted(() => {
document.addEventListener('click', handleClickOutside);
document.addEventListener('keydown', handleKeyDown);
emitter.on('closeAllContextMenus', () => {
if (visible.value) {
hideMenu();
}
});
});
// 卸载时移除事件监听
onUnmounted(() => {
document.removeEventListener('click', handleClickOutside);
document.removeEventListener('keydown', handleKeyDown);
emitter.off('closeAllContextMenus');
});
</script>
<style scoped>
.context-menu-wrapper {
position: relative;
height: 100%;
}
.hospital-menu {
position: fixed;
background-color: #fff;
border: 1px solid #dcdfe6;
border-radius: .25rem;
box-shadow: 0 .125rem .75rem rgba(0, 0, 0, 0.1);
z-index: 9999;
padding: .3125rem 0;
font-size: .8125rem;
font-family: SourceHanSansCN, SourceHanSansCN;
}
.menu-item {
padding: .3125rem .625rem;
cursor: pointer;
display: flex;
align-items: center;
transition: background-color 0.2s;
/* justify-content: space-between; */
}
.menu-item:hover:not(.disabled) {
background-color: #e6f7ff;
color: #165DFF;
}
.menu-item.disabled {
color: #c0c4cc;
cursor: not-allowed;
}
.menu-item i {
margin-right: .5rem;
font-size: .875rem;
width: 1rem;
text-align: center;
}
.menu-divider {
height: 1px;
background-color: #e5e7eb;
margin: .25rem 0;
}
.menu-item.danger {
color: #f53f3f;
}
.menu-item.danger:hover:not(.disabled) {
background-color: #fff1f0;
color: #f53f3f;
}
.menu-shortcut {
color: #909399;
margin-right: .3125rem;
}
</style>

View File

@ -1,6 +1,6 @@
<template> <template>
<el-popover :visible="selectVisible" placement="bottom" :width="'18vw'" @after-enter="initClickOutside"> <el-popover :visible="selectVisible" placement="bottom" :width="'16vw'">
<el-form :model="queryParams" class="query-form" label-width="5.625rem"> <el-form :model="queryParams" class="query-form" label-width="90px">
<!-- 病人类型选择 --> <!-- 病人类型选择 -->
<el-form-item label="病人类型:" prop="brly"> <el-form-item label="病人类型:" prop="brly">
<el-select v-model="queryParams.brly" placeholder="全部" clearable> <el-select v-model="queryParams.brly" placeholder="全部" clearable>
@ -26,7 +26,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<!-- 自审状态选择 --> <!-- 自审状态选择 -->
<el-form-item label-width="0.625" prop="autojgbz"> <el-form-item label-width="10px" prop="autojgbz">
<el-checkbox v-model="queryParams.autojgbz" true-value="1" false-value=""> 自审 </el-checkbox> <el-checkbox v-model="queryParams.autojgbz" true-value="1" false-value=""> 自审 </el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -56,7 +56,7 @@
<!-- 操作按钮 --> <!-- 操作按钮 -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleQuery" :size="props.size">确认查询</el-button> <el-button type="primary" @click="handleQuery" :size="props.size">确认查询</el-button>
<el-button @click="handleReset" style="margin-left: 0.5rem" :size="props.size">重置</el-button> <el-button @click="handleReset" style="margin-left: 8px" :size="props.size">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -181,14 +181,6 @@ const queryParams = ref<QueryParams>({
...props.initialParams ...props.initialParams
}) })
// 由于更多按钮在 app 元素内,给 app 元素注册的点击事件必须在弹出框显示后并且是一次性的
// 防止更多按钮的事件与之冲突
const initClickOutside = () => {
document.getElementById('app')!.addEventListener('click', () => {
selectVisible.value = false
}, { once: true })
}
// 记录上一次选中的值 // 记录上一次选中的值
const lastRadioValue = ref<string | undefined>(undefined); const lastRadioValue = ref<string | undefined>(undefined);
const handleRadioChange = (value: string) => { const handleRadioChange = (value: string) => {

View File

@ -113,22 +113,22 @@ setTimeout(() => {
} }
.scroll-btn { .scroll-btn {
width: 1.875rem; width: 30px;
height: 3rem; height: 48px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: #fff; background: #fff;
cursor: pointer; cursor: pointer;
z-index: 10; z-index: 10;
box-shadow: 0 0 .25rem rgba(0, 0, 0, 0.1); box-shadow: 0 0 4px rgba(0, 0, 0, 0.1);
transition: opacity 0.3s; transition: opacity 0.3s;
&.left { &.left {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
border-radius: .75rem 0 0 .75rem; border-radius: 12px 0 0 12px;
border: 1px solid #fff; border: 1px solid #fff;
} }
@ -136,7 +136,7 @@ setTimeout(() => {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
border-radius: 0 .75rem .75rem 0; border-radius: 0 12px 12px 0;
border: 1px solid #fff; border: 1px solid #fff;
} }
@ -149,7 +149,7 @@ setTimeout(() => {
.tab-wrapper { .tab-wrapper {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
padding: 0 1.875rem; // 给箭头留出空间 padding: 0 30px; // 给箭头留出空间
} }
.tab-list { .tab-list {
@ -170,11 +170,11 @@ setTimeout(() => {
.text { .text {
font-weight: 400; font-weight: 400;
font-size: 1rem; font-size: 16px;
color: #1F6DD3; color: #1F6DD3;
width: 5.625rem; width: 90px;
height: 3rem; height: 48px;
line-height: 3rem; line-height: 48px;
text-align: center; text-align: center;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;

34
src/types/Object.d.ts vendored
View File

@ -1,12 +1,12 @@
export interface LabReportInstr { export interface LabReportInstr {
index?: number; //序号 index?: number; //序号
yq: string; //仪器 yq: string; //仪器
xh: number; //序号 xh: number; //序号
bgdh: string; //报告单号 bgdh: string; //报告单号
yljg: string; //医疗机构 yljg: string; //医疗机构
type: string; //使用类型 type: string; //使用类型
condition: string; //使用条件 condition: string; //使用条件
status?: string; //状态 status?: string; //状态
} }
export interface DictData { export interface DictData {
@ -77,21 +77,3 @@ export class XmInfoNew {
redoxx: string; redoxx: string;
redosx: string; redosx: string;
} }
// 定义菜单项的类型
export interface ContextMenuItem {
// 菜单项类型:普通项或分隔线
type?: 'item' | 'divider';
// 菜单项显示文本
label?: string;
// 菜单项唯一标识,用于事件处理
action?: string;
// 是否为危险操作(如删除)
danger?: boolean;
// 是否禁用
disabled?: boolean;
// 快捷键提示文本
shortcut?: string;
// 菜单项的子级菜单项
props?: Record<string, any>;
}

View File

@ -2,25 +2,25 @@
<div class="app-container "> <div class="app-container ">
<div ref="compactForm"> <div ref="compactForm">
<el-row :gutter="10" class="compact-form" v-show="showSearch"> <el-row :gutter="10" class="compact-form" v-show="showSearch">
<el-form :model="queryParams" ref="queryRef" :inline="true" :size="aotuSize" :rules="queryRules"> <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="queryRules">
<el-form-item label="日期:" prop="failed1"> <el-form-item label="日期:" prop="failed1">
<el-date-picker v-model="queryParams.times" type="datetimerange" range-separator="-" <el-date-picker v-model="queryParams.times" type="datetimerange" range-separator="-"
start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" @change="handletime" style="width: 25rem;" /> value-format="YYYY-MM-DD HH:mm:ss" @change="handletime" />
</el-form-item> </el-form-item>
<el-form-item label="医疗机构:" prop="yljg"> <el-form-item label="医疗机构:" prop="yljg">
<el-select v-model="queryParams.yljg" placeholder="请选择" style="width: 9.37rem;"> <el-select v-model="queryParams.yljg" placeholder="请选择" style="width: 150px;">
<el-option v-for="item in dictData.HOS" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in dictData.HOS" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="条码状态:" prop="zt"> <el-form-item label="条码状态:" prop="zt">
<el-select v-model="queryParams.zt" placeholder="请选择" style="width: 6.25rem;"> <el-select v-model="queryParams.zt" placeholder="请选择" style="width: 100px;">
<el-option v-for="item in dictData.ST" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in dictData.ST" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="failed4"> <el-form-item label="" prop="failed4">
<el-select v-model="queryParams.failed4" placeholder="请选择" style="width:8.75"> <el-select v-model="queryParams.failed4" placeholder="请选择" style="width:140px">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -30,8 +30,10 @@
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<el-button icon="search" type="primary" @click="handleQuery" :size="aotuSize"> 搜索 </el-button> <el-button icon="search" type="primary" @click="handleQuery">
<el-button icon="Refresh" @click="resetQuery" :size="aotuSize">重置</el-button> 搜索
</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </el-row>
@ -42,31 +44,31 @@
<el-col :span="16" class="right-table"> <el-col :span="16" class="right-table">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" :size="aotuSize" plain icon="Plus" @click="printHandle">生成条码</el-button> <el-button type="primary" plain icon="Plus" @click="printHandle">生成条码</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" :size="aotuSize" plain icon="Edit" @click="selectStatusRows">选中所有未打印</el-button> <el-button type="danger" plain icon="Edit" @click="selectStatusRows">选中所有未打印</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" :size="aotuSize" plain @click="printPdf">打印</el-button> <el-button type="success" plain @click="printPdf">打印</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" :size="aotuSize" plain icon="Upload" @click="openBlock('采样登记')">采样登记</el-button> <el-button type="info" plain icon="Upload" @click="openBlock('采样登记')">采样登记</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" :size="aotuSize" plain @click="openBlock('送检登记')">送检登记</el-button> <el-button type="warning" plain @click="openBlock('送检登记')">送检登记</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" :size="aotuSize" plain @click="goReport">报告查询</el-button> <el-button type="warning" plain @click="goReport">报告查询</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" :size="aotuSize" plain @click="cancelHandle">条码作废</el-button> <el-button type="warning" plain @click="cancelHandle">条码作废</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" :size="aotuSize" plain>打印机设置</el-button> <el-button type="warning" plain>打印机设置</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" :size="aotuSize" plain>清单打印</el-button> <el-button type="warning" plain>清单打印</el-button>
</el-col> </el-col>
<!-- <right-toolbar v-model:showSearch="showSearch" @updateColumns="updateColumns" @queryTable="handleQuery" <!-- <right-toolbar v-model:showSearch="showSearch" @updateColumns="updateColumns" @queryTable="handleQuery"
:columns="columns"></right-toolbar> --> :columns="columns"></right-toolbar> -->
@ -99,7 +101,7 @@
</el-col> </el-col>
<el-col :span="8" class="right-table"> <el-col :span="8" class="right-table">
<!-- <div class="title"> 项目 </div> --> <!-- <div class="title"> 项目 </div> -->
<el-button type="primary" plain class="mb8" :size="aotuSize">拆分选中项目</el-button> <el-button type="primary" plain class="mb8">拆分选中项目</el-button>
<CustomTable :data="rightTableData" :columns="rightColumns" :config="rightTableConfig"> <CustomTable :data="rightTableData" :columns="rightColumns" :config="rightTableConfig">
<template #jjzt="{ row }"> <template #jjzt="{ row }">
{{ row.jjzt == '1' ? '计价' : '无' }} {{ row.jjzt == '1' ? '计价' : '无' }}
@ -164,7 +166,8 @@ import CustomTable from '@/components/elTable/index.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { usePrintStore } from '@/store/modules/printStore' import { usePrintStore } from '@/store/modules/printStore'
import { fetchCodeList, addObj, fetchCodeDetail, fetchCodeExec, fetchCodeReqmain } from '@/api/checkCode/index' import { fetchCodeList, addObj, fetchCodeDetail, fetchCodeExec, fetchCodeReqmain } from '@/api/checkCode/index'
const aotuSize = classCom.useAutoSize(); import { TableColumnCtx } from 'element-plus';
import dayjs from 'dayjs';
//@ts-ignore //@ts-ignore
import { comDict } from '@/utils/dict' import { comDict } from '@/utils/dict'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
@ -667,13 +670,13 @@ const printPdf = () => {
.right-table { .right-table {
border: 1px solid #E1E9F7; border: 1px solid #E1E9F7;
padding-top: .3125rem; padding-top: 5px;
} }
.title { .title {
border-bottom: 1px solid #E1E9F7; border-bottom: 1px solid #E1E9F7;
margin-bottom: .625rem; margin-bottom: 10px;
padding: .625rem; padding: 10px;
font-weight: 700; font-weight: 700;
} }
@ -681,9 +684,9 @@ const printPdf = () => {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
margin-top: .625rem; margin-top: 10px;
background-color: #f0f3f8; background-color: #f0f3f8;
padding: .625rem 2.5rem; padding: 10px 40px;
} }
.time-line-item { .time-line-item {
@ -699,42 +702,42 @@ const printPdf = () => {
align-items: center; align-items: center;
.index { .index {
width: 2.5rem; width: 40px;
height: 2.5rem; height: 40px;
line-height: 2.5rem; line-height: 40px;
background: #E1E9F7; background: #E1E9F7;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
font-family: SourceHanSansCN, SourceHanSansCN; font-family: SourceHanSansCN, SourceHanSansCN;
font-weight: 500; font-weight: 500;
font-size: 1.125rem; font-size: 18px;
color: #4767A3; color: #4767A3;
} }
.active { .active {
background-color: #4096ff; background-color: #4096ff;
box-shadow: 0 0 0 .25rem rgba(64, 150, 255, 0.2); box-shadow: 0 0 0 4px rgba(64, 150, 255, 0.2);
color: #FFF; color: #FFF;
} }
.timeline-title { .timeline-title {
font-family: SourceHanSansCN, SourceHanSansCN; font-family: SourceHanSansCN, SourceHanSansCN;
font-weight: 500; font-weight: 500;
font-size: 1rem; font-size: 16px;
color: #4767A3; color: #4767A3;
} }
.timeline-time { .timeline-time {
font-family: SourceHanSansCN, SourceHanSansCN; font-family: SourceHanSansCN, SourceHanSansCN;
font-weight: 400; font-weight: 400;
font-size: .875rem; font-size: 14px;
color: #4767A3; color: #4767A3;
} }
} }
.timg { .timg {
width: 3.125rem; width: 50px;
} }

View File

@ -5,7 +5,7 @@
@keyup.enter="handleInputFocus" /> @keyup.enter="handleInputFocus" />
<el-button type="primary" :size="aotuSize">打印条码</el-button> <el-button type="primary" :size="aotuSize">打印条码</el-button>
</div> </div>
<el-form :model="labPat" label-width="5rem" class="compact-form" label-position="right"> <el-form :model="labPat" label-width="70px" class="compact-form" label-position="right">
<div :class="['sh_box', getColor(lastJgbz)]" v-if="lastJgbz != null && lastJgbz != 0 && lastJgbz != 'C'"> <div :class="['sh_box', getColor(lastJgbz)]" v-if="lastJgbz != null && lastJgbz != 0 && lastJgbz != 'C'">
<div class="text">{{ getLableType(lastJgbz) }}</div> <div class="text">{{ getLableType(lastJgbz) }}</div>
</div> </div>
@ -398,7 +398,7 @@ onMounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.labpat_box { .labpat_box {
height: calc(90vh - 4.375rem); height: calc(90vh - 73px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;

View File

@ -1,85 +1,67 @@
<template> <template>
<div class="table-container"> <div class="table-container">
<ContextMenu :items="contextMenuItems" @select="handleMenuSelect" menu-width="200"> <CommonTable :table-data="labPatList" :loading="loading" :columns="tableColumns" :dict-data="dictData"
<CommonTable :table-data="labPatList" :loading="loading" :columns="tableColumns" :dict-data="dictData" :row-config="{ isHover: true, keyField: 'ybh' }" @current-change="handleRowClick" size="small"
:row-config="{ isHover: true, keyField: 'ybh' }" @current-change="handleRowClick" size="small" :row-style="rowStyle" :cell-style="cellStyle" class="mytable-style" ref="tableRef" :enable-column-drag="true"
:row-style="rowStyle" :cell-style="cellStyle" class="mytable-style" ref="tableRef" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd">
@column-drag-end="handleColumnDragEnd"> <!-- 完成状态列 -->
<!-- 完成状态列 --> <template #finish="{ row }">
<template #finish="{ row }"> <svg-icon v-if="row.finish == 1" icon-class="lvgou" />
<svg-icon v-if="row.finish == 1" icon-class="lvgou" /> <svg-icon v-else icon-class="hongcha" />
<svg-icon v-else icon-class="hongcha" /> </template>
</template> <template #jgbz="{ row }">
<template #jgbz="{ row }"> <el-checkbox :model-value="row.jgbz == '2'" readonly />
<el-checkbox :model-value="row.jgbz == '2'" readonly /> </template>
</template> <template #alarmflag="{ row }">
<template #alarmflag="{ row }"> <el-checkbox :model-value="row.alarmflag == '1'" readonly />
<el-checkbox :model-value="row.alarmflag == '1'" readonly /> </template>
</template>
<template #brly="{ row }"> <template #brly="{ row }">
{{ formatDict(row.brly, 'PT') }} {{ formatDict(row.brly, 'PT') }}
</template> </template>
<template #brxm="{ row }"> <template #brxm="{ row }">
<span :style="{ color: row.jzbz == '1' ? '#f00' : '' }">{{ row.brxm }}</span> <span :style="{ color: row.jzbz == '1' ? '#f00' : '' }">{{ row.brxm }}</span>
</template> </template>
<template #brxb="{ row }"> <template #brxb="{ row }">
{{ formatDict(row.brxb, 'SX') }} {{ formatDict(row.brxb, 'SX') }}
</template> </template>
<template #nldw="{ row }"> <template #nldw="{ row }">
{{ formatDict(row.nldw, 'AU') }} {{ formatDict(row.nldw, 'AU') }}
</template> </template>
<template #yblx="{ row }"> <template #yblx="{ row }">
{{ formatDict(row.yblx, 'BT') }} {{ formatDict(row.yblx, 'BT') }}
</template> </template>
<template #ksdh="{ row }"> <template #ksdh="{ row }">
{{ formatDict(row.ksdh, 'DP') }} {{ formatDict(row.ksdh, 'DP') }}
</template> </template>
<template #yhdh="{ row }"> <template #yhdh="{ row }">
{{ formatDict(row.yhdh, 'SRD') }} {{ formatDict(row.yhdh, 'SRD') }}
</template> </template>
<template #autojgbz="{ row }"> <template #autojgbz="{ row }">
<el-checkbox :model-value="row.autojgbz === '1'" readonly /> <el-checkbox :model-value="row.autojgbz === '1'" readonly />
</template> </template>
<template #dybz="{ row }"> <template #dybz="{ row }">
<el-checkbox :model-value="row.dybz === '1'" readonly /> <el-checkbox :model-value="row.dybz === '1'" readonly />
</template> </template>
<template #fslx="{ row }"> <template #fslx="{ row }">
<el-checkbox :model-value="row.dybz === '1'" readonly /> <el-checkbox :model-value="row.dybz === '1'" readonly />
</template> </template>
<template #yljg="{ row }"> <template #yljg="{ row }">
{{ formatDict(row.yljg, 'HOS') }} {{ formatDict(row.yljg, 'HOS') }}
</template> </template>
</CommonTable> </CommonTable>
</ContextMenu>
<el-dialog v-model="show" title="标准结果作为某标本复查结果" width="300" :close-on-click-modal="false" :draggable="true"
@close="closeHandle">
<div>
仪器:
<yqSelectTable v-model:data="tableKey.yq" width="200px" />
<div>请输入复查的样本号:</div>
<el-input v-model="fcYbh" />
</div>
<div style="text-align: center; width: 100%;">
<el-button type="primary" @click="subHandle()"> 确认 </el-button>
<el-button @click="closeHandle">取消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, nextTick, onMounted } from 'vue' import { ref, nextTick, onMounted } from 'vue'
import CommonTable from '@/components/vxeTable/index.vue' import CommonTable from '@/components/vxeTable/index.vue'
import ContextMenu from "@/components/contextMenu/index.vue"; import { color } from 'echarts'
import { ContextMenuItem } from '@/types/index'
import yqSelectTable from '@/components/SelectTable/YQSelectTable/index.vue'
const props = defineProps({ const props = defineProps({
labPatList: { labPatList: {
type: Array, type: Array,
@ -100,22 +82,7 @@ const props = defineProps({
}) })
const emits = defineEmits(['select']) const emits = defineEmits(['select'])
const show = ref(false)
const fcYbh = ref('')
const subHandle = () => {
}
const closeHandle = () => {
show.value = false
}
const contextMenuItems = computed<ContextMenuItem[]>(() => [
{ label: '标准结果作为某标本复查结果', action: 'view' }
]);
const handleMenuSelect = ((item: ContextMenuItem) => {
console.log('item==>', item);
show.value = true
})
// 表格列配置 // 表格列配置
const tableColumns = ref([ const tableColumns = ref([
{ field: 'finish', title: '完', width: 20, align: 'center', slotName: 'finish', resizable: true }, { field: 'finish', title: '完', width: 20, align: 'center', slotName: 'finish', resizable: true },
@ -213,6 +180,19 @@ defineExpose({
<style lang="scss" scoped> <style lang="scss" scoped>
.table-container { .table-container {
height: 76vh; height: calc(90vh - 141px);
display: flex;
flex-direction: column;
}
.mytable-style {
flex: 1;
}
.common-table {
flex: 1;
border-color: #e5e7eb;
} }
</style> </style>

View File

@ -15,50 +15,49 @@
<el-button type="primary" plain icon="View" :size="aotuSize" @click="previewHandle">预览</el-button> <el-button type="primary" plain icon="View" :size="aotuSize" @click="previewHandle">预览</el-button>
</div> </div>
</div> </div>
<ContextMenu :items="contextMenuItems" @select="handleMenuSelect">
<CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig" :enable-column-drag="true"
@row-click="handleRowClick" @column-drag-end="handleColumnDragEnd" class="custom-table-container">
<template #index="{ row, $index }">
<el-popover effect="dark" v-if="row.cp_modify == 1" @before-enter="beforeEnter(row)" width="300">
<template #reference>
<div style="width: 100%;">{{ $index + 1 }}</div>
</template>
<template #default>
<el-row>
<el-col>修改前结果:{{ lastResult.csjg }}</el-col>
<el-col>修改日期:{{ lastResult.xgrq }}</el-col>
<el-col>修改人:{{ formatYs(lastResult.xgr) }}</el-col>
<el-col>上次审核时间:{{ lastResult.shsj }}</el-col>
<el-col>上次审核人:{{ formatYs(lastResult.shys) }}</el-col>
</el-row>
</template>
</el-popover>
<span v-else>{{ $index + 1 }}</span>
</template>
<template #csjg="{ row }"> <CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig" :enable-column-drag="true"
<el-input v-model="row.csjg" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small" @row-click="handleRowClick" @column-drag-end="handleColumnDragEnd" class="custom-table-container">
class="full-width-input" @change="handleCsjgEnter(row)" @dblclick="handleInputFocus(row)" /> <template #index="{ row, $index }">
<span v-else>{{ row.csjg }}</span> <el-popover effect="dark" v-if="row.cp_modify == 1" @before-enter="beforeEnter(row)" width="300">
</template> <template #reference>
<template #cp_compa="{ column, $index }"> <div style="width: 100%;">{{ $index + 1 }}</div>
{{ lastjyrq }} </template>
</template> <template #default>
<template #refs="{ row }"> <el-row>
{{ row.refs }}{{ row.dw }} <el-col>修改前结果:{{ lastResult.csjg }}</el-col>
</template> <el-col>修改日期:{{ lastResult.xgrq }}</el-col>
<template #od="{ row }"> <el-col>修改人:{{ formatYs(lastResult.xgr) }}</el-col>
<el-input v-model="row.od" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small" <el-col>上次审核时间:{{ lastResult.shsj }}</el-col>
class="full-width-input" @change="handleCsjgEnter(row)" /> <el-col>上次审核人:{{ formatYs(lastResult.shys) }}</el-col>
<span v-else>{{ row.od }}</span> </el-row>
</template> </template>
<template #cutoff="{ row }"> </el-popover>
<el-input v-model="row.cutoff" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small" <span v-else>{{ $index + 1 }}</span>
class="full-width-input" @change="handleCsjgEnter(row)" /> </template>
<span v-else>{{ row.cutoff }}</span>
</template> <template #csjg="{ row }">
</CustomTable> <el-input v-model="row.csjg" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small"
</ContextMenu> class="full-width-input" @change="handleCsjgEnter(row)" @dblclick="handleInputFocus(row)" />
<span v-else>{{ row.csjg }}</span>
</template>
<template #cp_compa="{ column, $index }">
{{ lastjyrq }}
</template>
<template #refs="{ row }">
{{ row.refs }}{{ row.dw }}
</template>
<template #od="{ row }">
<el-input v-model="row.od" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small" class="full-width-input"
@change="handleCsjgEnter(row)" />
<span v-else>{{ row.od }}</span>
</template>
<template #cutoff="{ row }">
<el-input v-model="row.cutoff" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small"
class="full-width-input" @change="handleCsjgEnter(row)" />
<span v-else>{{ row.cutoff }}</span>
</template>
</CustomTable>
<!-- <div class="flex-between mt10"> <!-- <div class="flex-between mt10">
<div> <div>
<el-button class="btn_green" @click=" ">初报</el-button> <el-button class="btn_green" @click=" ">初报</el-button>
@ -159,7 +158,7 @@
</template> </template>
<script setup> <script setup>
import { ref, toRefs, watch, nextTick, onMounted, computed } from "vue"; import { ref, toRefs, watch, nextTick, onMounted } from "vue";
import { import {
check1, check2, uncheck2, unconfirmlog, checkuser, reglimit, queryXmInfo, deleteresult, changeresult, check1, check2, uncheck2, unconfirmlog, checkuser, reglimit, queryXmInfo, deleteresult, changeresult,
newresult, queryXmVal, printListwork, getresultchangelog, setinputmdl, saveResult newresult, queryXmVal, printListwork, getresultchangelog, setinputmdl, saveResult
@ -174,7 +173,6 @@ import dayjs from 'dayjs';
import { listUser } from '@/api/system/user.js' import { listUser } from '@/api/system/user.js'
import emitter from "@/utils/mitt"; import emitter from "@/utils/mitt";
import { useCommonStore } from "@/store/modules/commonStore"; import { useCommonStore } from "@/store/modules/commonStore";
import ContextMenu from "@/components/contextMenu/index.vue";
// 组件属性定义 // 组件属性定义
const props = defineProps({ const props = defineProps({
@ -247,44 +245,8 @@ watch(() => props.resultSysList, (newVal) => {
}); });
}, { deep: true }); }, { deep: true });
// 右键菜单配置
const contextMenuItems = computed(() => [
{ label: '打印预览', action: 'view', shortcut: 'V', },
{ label: 'PDF报告预览', action: 'bgyl', shortcut: 'P', },
{ label: '合并病人当前其他结果', action: 'merge', shortcut: 'B', },
{ type: 'divider' },
{ label: '锁定报告', action: 'Lock', shortcut: 'L', },
{ label: '解除报告锁定', action: 'lift', shortcut: 'W', },
{ type: 'divider' },
{ label: '删除记录', action: 'delete', danger: true, shortcut: 'd', }
]);
// 处理菜单选择
const handleMenuSelect = (item) => {
// 根据不同的操作执行相应逻辑
switch (item.action) {
case 'view':
alert(`打印预览`);
break;
case 'bgyl':
alert(`PDF报告预览`);
break;
case 'merge':
alert(`合并病人当前其他结果`);
break;
case 'Lock':
alert(`锁定报告`);
break;
case 'lift':
alert(`解除报告锁定`);
break;
case 'delete':
if (confirm(`确定要删除患者的记录吗?`)) {
}
break;
}
};
const columns = ref([ const columns = ref([
{ label: 'No', prop: 'index', width: 30, align: 'center', visible: true, slot: "index" }, { label: 'No', prop: 'index', width: 30, align: 'center', visible: true, slot: "index" },
{ label: "复", prop: "redo_flag", width: 30, align: 'center', visible: true, }, { label: "复", prop: "redo_flag", width: 30, align: 'center', visible: true, },
@ -344,7 +306,7 @@ const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
const tableConfig = ref({ const tableConfig = ref({
border: true, // 边框 border: true, // 边框
height: '100%', // 高度 height: '100%', // 高度
maxHeight: '78vh', // max高度 maxHeight: '77vh', // max高度
highlightCurrentRow: true, // 高亮当前行 highlightCurrentRow: true, // 高亮当前行
cellStyle: cellStyle, cellStyle: cellStyle,
}) })
@ -875,7 +837,7 @@ const formatYs = (v) => {
<style scoped lang="scss"> <style scoped lang="scss">
.result-container { .result-container {
height: calc(90vh - 4.3rem); height: calc(90vh - 74px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
@ -887,6 +849,6 @@ const formatYs = (v) => {
} }
.custom-table-container { .custom-table-container {
height: 100%; flex: 1;
} }
</style> </style>

View File

@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="日期:" prop="jyrq"> <el-form-item label="日期:" prop="jyrq">
<el-date-picker v-model="queryParams.jyrq" type="date" label-width="1.25rem" placeholder="检验日期" <el-date-picker v-model="queryParams.jyrq" type="date" label-width="20px" placeholder="检验日期"
value-format="YYYY-MM-DD" :clearable="false" @change="fetchlabPatList" value-format="YYYY-MM-DD" :clearable="false" @change="fetchlabPatList"
style="width:100%"></el-date-picker> style="width:100%"></el-date-picker>
</el-form-item> </el-form-item>
@ -62,9 +62,9 @@
<el-col :span="11"> <el-col :span="11">
<div> <div>
<tabView :tabList="tabList" v-model:activeTab="activeTab" /> <tabView :tabList="tabList" v-model:activeTab="activeTab" />
<div class="box-shadow right_box"> <div class="box-shadow">
<template v-if="activeTab == 1"> <template v-if="activeTab == 1">
<div class="flex-between"> <div class="flex-between mb10">
<div> <div>
<el-button type="primary" :size="aotuSize" icon="RefreshRight" @click="fetchlabPatList">刷新</el-button> <el-button type="primary" :size="aotuSize" icon="RefreshRight" @click="fetchlabPatList">刷新</el-button>
<el-button type="danger" :size="aotuSize" @click="delSampleHd">删除</el-button> <el-button type="danger" :size="aotuSize" @click="delSampleHd">删除</el-button>
@ -614,6 +614,7 @@ getSysList()
onMounted(async () => { onMounted(async () => {
// 加载病人来源字典 // 加载病人来源字典
const dictRefs = await comDict('PT', 'AU', 'SX', 'DP', 'BT', 'SRD', 'HOS', 'ST'); const dictRefs = await comDict('PT', 'AU', 'SX', 'DP', 'BT', 'SRD', 'HOS', 'ST');
// 从 ref 中获取实际数据 // 从 ref 中获取实际数据
dictData.value = { dictData.value = {
PT: toRaw(dictRefs.PT.value) || [], PT: toRaw(dictRefs.PT.value) || [],
@ -635,17 +636,9 @@ onMounted(async () => {
.box-shadow { .box-shadow {
box-shadow: 2px 2px 4px 0px rgba(206, 217, 234, 0.7); box-shadow: 2px 2px 4px 0px rgba(206, 217, 234, 0.7);
border-radius: .75rem; border-radius: 12px;
padding: .5rem; padding: 10px;
background-color: #fff; background-color: #fff;
.flex-between {
margin-bottom: .5rem;
}
}
.right_box {
height: calc(90vh - 3.4rem);
} }
.compact-form { .compact-form {
@ -653,20 +646,20 @@ onMounted(async () => {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
.el-form-item--default { .el-form-item--default {
margin-bottom: .3125rem !important; margin-bottom: 5px !important;
} }
.el-form-item--small { .el-form-item--small {
margin-bottom: .3125rem !important; margin-bottom: 5px !important;
} }
} }
.card-content { .card-content {
max-height: 28.125rem; max-height: 450px;
/* 设置最大高度 */ /* 设置最大高度 */
overflow-y: auto; overflow-y: auto;
/* 超出高度时显示垂直滚动条 */ /* 超出高度时显示垂直滚动条 */
padding: .3125rem; padding: 5px;
/* 保持与卡片默认一致的内边距 */ /* 保持与卡片默认一致的内边距 */
} }
@ -677,7 +670,7 @@ onMounted(async () => {
justify-content: space-around; justify-content: space-around;
font-family: SourceHanSansCN, SourceHanSansCN; font-family: SourceHanSansCN, SourceHanSansCN;
font-weight: 500; font-weight: 500;
font-size: 1rem; font-size: 16px;
color: #28BDBB; color: #28BDBB;
// margin-top: 20px; // margin-top: 20px;