diff --git a/package.json b/package.json index e14f884..4ebc885 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "js-cookie": "3.0.5", "jsbarcode": "^3.12.1", "jsencrypt": "3.3.2", + "mitt": "^3.0.1", "nprogress": "0.2.0", "pinia": "2.1.7", "pinyin-pro": "^3.26.0", diff --git a/src/App.vue b/src/App.vue index 31839f2..2088584 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,15 +1,69 @@ + + diff --git a/src/api/liswork/work/LisWork.ts b/src/api/liswork/work/LisWork.ts index c5459d1..b6fefde 100644 --- a/src/api/liswork/work/LisWork.ts +++ b/src/api/liswork/work/LisWork.ts @@ -257,6 +257,23 @@ export function inputmdl(query?: Object) { params: query }) } + +// 项目模板输入结果 +export function setinputmdl(query?: Object) { + return request({ + url: '/liswork/setinputmdl', + method: 'get', + params: query + }) +} +// 保存病人结果 +export function saveResult(query?: Object) { + return request({ + url: '/lisworkoper/saveresult', + method: 'post', + data: query + }) +} // 获取复查结果 export function redoResult(query?: Object) { return request({ @@ -282,3 +299,4 @@ export function getresultchangelog(query?: Object) { }) } + diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 693bf2e..0ec4717 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -292,6 +292,12 @@ // 高亮 .vxe-table--render-default .vxe-body--row.row--current { background-color: #a4beef !important; + color: #FFF !important; + } + + .vxe-table--render-default .vxe-body--row.row--current .vxe-cell { + background-color: #a4beef !important; + color: #FFF !important; } // 滚动条 diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue index 887ff47..30ca499 100644 --- a/src/components/SelectTable/index.vue +++ b/src/components/SelectTable/index.vue @@ -208,9 +208,8 @@ watch(() => props.data, (newVal) => { // 输入框键盘事件处理（专门处理上下键） const handleInputKeydown = (e: KeyboardEvent) => { - // 仅处理上下方向键 - if (e.key !== "ArrowUp" && e.key !== "ArrowDown") return; - + // 仅处理上下方向回车键 + if (!['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) return; // 阻止事件冒泡到输入框父元素 e.stopPropagation(); @@ -229,6 +228,12 @@ const handleInputKeydown = (e: KeyboardEvent) => { const event = new KeyboardEvent('keydown', { key: e.key }); tableContainer?.dispatchEvent(event); }); + + // 回车确认 + if (e.key === "Enter") { + const currentRow = filterData.value[currentIndex.value]; + handleRowChange(currentRow); + } } }; diff --git a/src/components/vxeTable/index.vue b/src/components/vxeTable/index.vue index 2d65812..c61e114 100644 --- a/src/components/vxeTable/index.vue +++ b/src/components/vxeTable/index.vue @@ -214,11 +214,11 @@ defineExpose({ // 表格边框 :deep(.vxe-table--render-default.border--full .vxe-body--column) { - background-image: linear-gradient(#96B8D9, #96B8D9), linear-gradient(#96B8D9, #96B8D9); + background-image: linear-gradient(#96B8D9, #96B8D9), linear-gradient(#96B8D9, #96B8D9) !important; } // 表头边框 :deep(.vxe-table--render-default.border--full .vxe-header--column) { - background-image: linear-gradient(#1F6DD3, #1F6DD3), linear-gradient(#1F6DD3, #1F6DD3); + background-image: linear-gradient(#1F6DD3, #1F6DD3), linear-gradient(#1F6DD3, #1F6DD3) !important; } \ No newline at end of file diff --git a/src/store/modules/commonStore.ts b/src/store/modules/commonStore.ts new file mode 100644 index 0000000..f260ab5 --- /dev/null +++ b/src/store/modules/commonStore.ts @@ -0,0 +1,13 @@ +//公共状态管理 +import { defineStore } from 'pinia' + +export const useCommonStore = defineStore('commonStore', { + state: () => ({ + lxsrs: [] as string[], // 存储项目模板名称 + }), + actions: { + setLxsrList(list: any[]) { + this.lxsrs = list + }, + } +}) \ No newline at end of file diff --git a/src/utils/mitt.ts b/src/utils/mitt.ts new file mode 100644 index 0000000..ae5fac7 --- /dev/null +++ b/src/utils/mitt.ts @@ -0,0 +1,5 @@ +// utils/mitt.ts +import mitt from "mitt" +const emitter = mitt() + +export default emitter \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index deda5fc..f1901d6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -75,8 +75,8 @@ service.interceptors.request.use(config => { const s_time = sessionObj.time; // 请求时间 const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { - const message = '数据正在处理，请勿重复提交'; - console.warn(`[${s_url}]: ` + message) + // const message = '数据正在处理，请勿重复提交'; + // console.warn(`[${s_url}]: ` + message) return Promise.reject(new Error(message)) } else { cache.session.setJSON('sessionObj', requestObj) diff --git a/src/views/checkCode/index.vue b/src/views/checkCode/index.vue index 429e759..8ccc2fa 100644 --- a/src/views/checkCode/index.vue +++ b/src/views/checkCode/index.vue @@ -249,12 +249,12 @@ const loading = ref(true); const tableData = ref([]) // 配置项 const columns = ref([ - { type: 'selection', visible: true, align: 'center', width: 40, label: '多选框' }, + { type: 'selection', visible: true, align: 'center', width: 35, label: '多选框' }, // { type: 'index', visible: true, align: 'center', width: 60, label: '序号' }, - { prop: 'zt', label: '印', visible: true, align: 'center', slot: 'dy', width: 20 }, - { prop: 'jzbz', label: '急', align: 'center', visible: true, slot: 'jzbz', width: 20 }, - { prop: 'ch', label: '床号', visible: true, align: 'center', width: 30 },//sortable: true, - { prop: 'brxm', label: '姓名', align: 'center', visible: true, width: 40 }, + { prop: 'zt', label: '打印', visible: true, align: 'center', slot: 'dy', width: 40 }, + { prop: 'jzbz', label: '急', align: 'center', visible: true, slot: 'jzbz', width: 30 }, + { prop: 'ch', label: '床号', visible: true, align: 'center', width: 40 },//sortable: true, + { prop: 'brxm', label: '姓名', align: 'center', visible: true, width: 50 }, { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 30 }, { prop: 'jymd', label: '项目名称', visible: true, width: 130 }, { prop: 'bgddhname', label: '类别', align: 'center', visible: true, width: 80 }, @@ -557,7 +557,7 @@ onMounted(async () => { // 字典格式化方法 const formatDict = (v: string, dictType: string) => { - return dictData.value[dictType]?.find((item: any) => item.value == v)?.label; + return dictData.value[dictType]?.find((item: any) => item.value == v)?.label || v; }; // 计算table高度 diff --git a/src/views/liswork/work/charge/index.vue b/src/views/liswork/work/charge/index.vue index 9df7896..7dacf12 100644 --- a/src/views/liswork/work/charge/index.vue +++ b/src/views/liswork/work/charge/index.vue @@ -134,10 +134,10 @@ const handleColumnDragEnd = (data: any) => { }; const formatDict = (v: string, dictType: string) => { - return dictData.value[dictType]?.find((item: any) => item.value == v)?.label + return dictData.value[dictType]?.find((item: any) => item.value == v)?.label || v; } const formatys = (v: string) => { - return userList.value.find((item: any) => item.userName == v)?.nickName + return userList.value.find((item: any) => item.userName == v)?.nickName || v; } const getSummaries = ({ columns, data }: { columns: any, data: any }) => { diff --git a/src/views/liswork/work/combination/index.vue b/src/views/liswork/work/combination/index.vue index 3249bd2..87b0cc1 100644 --- a/src/views/liswork/work/combination/index.vue +++ b/src/views/liswork/work/combination/index.vue @@ -1,8 +1,9 @@