diff --git a/src/api/doctor/assessment.ts b/src/api/doctor/assessment.ts new file mode 100644 index 0000000..4ef5270 --- /dev/null +++ b/src/api/doctor/assessment.ts @@ -0,0 +1,50 @@ +import request from '@/utils/request' + +// 根据住院号获取病人信息 +export function queryPatInfo(query?: Object) { + return request({ + url: '/doctor/applyBefore/getPatInfo', + method: 'get', + params: query + }) +} +// 查询单据信息 +export function queryPatList(query?: Object) { + return request({ + url: '/doctor/applyBefore/queryList', + method: 'get', + params: query + }) +} +// 打印单据信息 +export function printPat(query?: Object) { + return request({ + url: '/doctor/applyBefore/print', + method: 'get', + params: query + }) +} +// 保存信息 +export function savePat(query?: Object) { + return request({ + url: '/doctor/applyBefore/save', + method: 'post', + data: query + }) +} +// 修改信息 +export function updatePat(query?: Object) { + return request({ + url: '/doctor/applyBefore/update', + method: 'post', + data: query + }) +} +// 删除信息 +export function delPat(query?: Object) { + return request({ + url: '/doctor/applyBefore/delete', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/liswork/dict/ComDict.ts b/src/api/liswork/dict/ComDict.ts index ace0db9..2e4073b 100644 --- a/src/api/liswork/dict/ComDict.ts +++ b/src/api/liswork/dict/ComDict.ts @@ -1,10 +1,9 @@ -// @ts-ignore import request from '@/utils/request' // 查询字典数据列表 export function queryComDictListService(query?: Object) { return request({ - url: '/comdict/query', + url: '/bus/bloodbank/dmzd/queryList', method: 'get', params: query }) @@ -12,7 +11,7 @@ export function queryComDictListService(query?: Object) { //增加字典数据 export function addComDictService(data?: Object) { return request({ - url: '/comdict/add', + url: '/bus/bloodbank/dmzd/add', method: 'post', data }) @@ -21,7 +20,7 @@ export function addComDictService(data?: Object) { //修改字典数据 export function updateComDictService(data?: Object) { return request({ - url: '/comdict/update', + url: '/bus/bloodbank/dmzd/update', method: 'post', data }) @@ -30,18 +29,18 @@ export function updateComDictService(data?: Object) { //删除字典数据 export function delComDictService(data?: Object) { return request({ - url: '/comdict/del', - method: 'delete', - data + url: '/bus/bloodbank/dmzd/delete', + method: 'get', + params: data }) } // 根据字典类型查询字典数据信息 -export function getComDicts(dict_type?: Object) { +export function getComDicts(data?: Object) { return request({ - url: '/transitdict/regdict/getInfoOne', + url: '/bus/common/queryDictData', method: 'get', - params: dict_type + params: data }) } \ No newline at end of file diff --git a/src/api/liswork/dict/LabInstr.ts b/src/api/liswork/dict/LabInstr.ts deleted file mode 100644 index a31d3b5..0000000 --- a/src/api/liswork/dict/LabInstr.ts +++ /dev/null @@ -1,19 +0,0 @@ -// @ts-ignore -import request from '@/utils/request' - -// 查询字典数据列表 -export function querylabInstrList(query?: Object) { - return request({ - url: '/instr/query', - method: 'get', - params: query - }) -} -// 查询字典数据列表 -export function querylabInstrListByLisgroup(query?: Object) { - return request({ - url: '/instr/querybylisgroup', - method: 'get', - params: query - }) -} \ No newline at end of file diff --git a/src/api/regional/dict/diagnosis.ts b/src/api/regional/dict/diagnosis.ts deleted file mode 100644 index 34a886d..0000000 --- a/src/api/regional/dict/diagnosis.ts +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询诊断列表 -export function listdiagnosis(query: Object) { - return request({ - url: '/transitdict/diagnosis/list', - method: 'get', - params: query - }) -} - -// 查询诊断详细 -export function getdiagnosis(diagnosisId: number) { - return request({ - url: '/transitdict/diagnosis/' + diagnosisId, - method: 'get' - }) -} - -// 新增诊断 -export function adddiagnosis(data: Object) { - return request({ - url: '/transitdict/diagnosis', - method: 'post', - data: data - }) -} - -// 修改诊断 -export function updatediagnosis(data: Object) { - return request({ - url: '/transitdict/diagnosis', - method: 'put', - data: data - }) -} - -// 删除诊断 -export function deldiagnosis(diagnosisId: number) { - return request({ - url: '/transitdict/diagnosis/' + diagnosisId, - method: 'delete' - }) -} diff --git a/src/api/regional/dict/itemclass.ts b/src/api/regional/dict/itemclass.ts deleted file mode 100644 index 8bf6c9c..0000000 --- a/src/api/regional/dict/itemclass.ts +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询诊断列表 -export function listitemclass(query: Object) { - return request({ - url: '/transitdict/itemclass/list', - method: 'get', - params: query - }) -} - -// 查询诊断详细 -export function getitemclass(itemclassId: number) { - return request({ - url: '/transitdict/itemclass/' + itemclassId, - method: 'get' - }) -} - -// 新增诊断 -export function additemclass(data: Object) { - return request({ - url: '/transitdict/itemclass', - method: 'post', - data: data - }) -} - -// 修改诊断 -export function updateitemclass(data: Object) { - return request({ - url: '/transitdict/itemclass', - method: 'put', - data: data - }) -} - -// 删除诊断 -export function delitemclass(itemclassId: number) { - return request({ - url: '/transitdict/itemclass/' + itemclassId, - method: 'delete' - }) -} diff --git a/src/api/regional/dict/regdict.ts b/src/api/regional/dict/regdict.ts deleted file mode 100644 index 33cbd26..0000000 --- a/src/api/regional/dict/regdict.ts +++ /dev/null @@ -1,59 +0,0 @@ -import request from '@/utils/request' - -// 查询字典列表 -export function listregdict(query: Object) { - return request({ - url: '/transitdict/regdict/list', - method: 'get', - params: query - }) -} -// 获取字典最大编码 -export function getMaxDictCode(query: Object) { - return request({ - url: '/transitdict/regdict/getMaxDictCode', - method: 'get', - params: query - }) -} - -// 查询字典详细 -export function getregdict(regdictId: number) { - return request({ - url: '/transitdict/regdict/' + regdictId, - method: 'get' - }) -} - -// 新增字典 -export function addregdict(data: Object) { - return request({ - url: '/transitdict/regdict', - method: 'post', - data: data - }) -} - -// 修改字典 -export function updateregdict(data: Object) { - return request({ - url: '/transitdict/regdict', - method: 'put', - data: data - }) -} - -// 删除字典 -export function delregdict(regdictId: number) { - return request({ - url: '/transitdict/regdict/' + regdictId, - method: 'delete' - }) -} -// 清空缓存 -export function clearCache() { - return request({ - url: '/transitdict/regdict/clearCache', - method: 'get' - }) -} diff --git a/src/api/regional/dict/hospital.ts b/src/api/regional/hospital.ts similarity index 100% rename from src/api/regional/dict/hospital.ts rename to src/api/regional/hospital.ts diff --git a/src/api/regional/index.ts b/src/api/regional/index.ts deleted file mode 100644 index 6ef11ab..0000000 --- a/src/api/regional/index.ts +++ /dev/null @@ -1,108 +0,0 @@ -// @ts-ignore -import request from '@/utils/request' - -// 获取流转数据 -export function querySample(query?: Object) { - return request({ - url: '/transit/querySample', - method: 'get', - params: query - }) -} -// 获取未签收的标本 -export function querySampleSign(query?: Object) { - return request({ - url: '/transit/querySampleSign', - method: 'get', - params: query - }) -} -// 签收标本 -export function sampleSign(query?: Object) { - return request({ - url: '/transit/sampleSign', - method: 'post', - data: query - }) -} -// 退回的标本 -export function querySampleSignBack(query?: Object) { - return request({ - url: '/transit/querySampleSignBack', - method: 'get', - params: query - }) -} -// 标本数量统计 -export function querySampleTypeCount(query?: Object) { - return request({ - url: '/transitReport/sampleTypeCount', - method: 'get', - params: query - }) -} -// 标本报表 -export function sampleTypeCount(query?: Object) { - return request({ - url: '/transitReport/sampleTypeCount', - method: 'get', - params: query - }) -} -// 标本报表费用 -export function sampleitemCount(query?: Object) { - return request({ - url: '/transitReport/itemCount', - method: 'get', - params: query - }) -} -// 标本报表费用 -export function getallcount(query?: Object) { - return request({ - url: '/transitstat/getallcount', - method: 'get', - params: query - }) -} -// 获取流转项目列表 -export function getXmList(query?: Object) { - return request({ - url: '/item/getList', - method: 'get', - params: query - }) -} -// 新增项目 -export function addXmInfo(query?: Object) { - return request({ - url: '/item/add', - method: 'post', - data: query - }) -} -// 修改项目 -export function updateXmInfo(query?: Object) { - return request({ - url: '/item/update', - method: 'post', - data: query - }) -} -// 删除项目 -export function deleteXmInfo(query?: Object) { - return request({ - url: '/item/delete', - method: 'post', - data: query - }) -} -// 获取已打印的条码数据 -export function sampleCollect(query?: Object) { - return request({ - url: '/transit/sampleCollect', - method: 'get', - params: query - }) -} - diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 28ce74a..b0d9071 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -124,7 +124,7 @@ aside { .app-container { padding: 10px 10px 0 10px; height: calc(100vh - 5.25rem); - background-color: #f9f9f9; + background-color: #e6edf9; box-sizing: border-box; } @@ -470,7 +470,7 @@ aside { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f6fafc !important; + background-color: #eff6fa !important; color: #3c526f; height: 1.875rem !important; font-size: 15px; @@ -490,18 +490,13 @@ aside { } - /* 表格最外层边框(可选) */ - .el-table--border { - border: 1px solid #ece9ea !important; - } - .el-scrollbar__thumb { - background-color: #d9ecf7 !important; + background-color: #d8d8d8 !important; opacity: 1; } .el-scrollbar__thumb:hover { - background-color: #d9ecf7 !important; + background-color: #d8d8d8 !important; opacity: 1; } @@ -515,10 +510,7 @@ aside { line-height: 1.8125rem; } - // .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { - // background-color: #a4beef !important; - // color: #000 !important; - // } + .cell.el-tooltip { padding: 0 !important; @@ -562,6 +554,20 @@ aside { .el-table__empty-block { width: 100% !important; } + + --el-table-border-color:#ccc; // 边框颜色 + + .el-table__header th { + border-color: #ccc !important; + } + + .el-table__body td { + border-color: #ccc !important; + } + + .el-table__row { + border-color: #ccc !important; + } } diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue index d0c1cf7..3f88be7 100644 --- a/src/components/SelectTable/index.vue +++ b/src/components/SelectTable/index.vue @@ -361,8 +361,8 @@ const clearHandle = () => { :deep(.vxe-header--row th) { border-color: #00a5ff; - background-color: #00a5ff; - color: #fff; + // background-color: #e6edf9; + font-size: 14px; } :deep(.vxe-body--row td) { @@ -389,7 +389,7 @@ const clearHandle = () => { // 表头边框 :deep(.vxe-table--render-default.border--full .vxe-header--column) { - background-image: linear-gradient(#00a5ff, #00a5ff), linear-gradient(#00a5ff, #00a5ff) !important; + background-image: linear-gradient(#e6edf9, #e6edf9), linear-gradient(#e6edf9, #e6edf9) !important; } .select-table-dropdown { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 53c1e74..5e1c463 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -51,7 +51,7 @@ import RuoYiDoc from '@/components/RuoYi/Doc/index.vue' import useAppStore from '@/store/modules/app' import useUserStore from '@/store/modules/user' import useSettingsStore from '@/store/modules/settings' -import { listhospital } from '@/api/regional/dict/hospital' +import { listhospital } from '@/api/regional/hospital' const appStore = useAppStore() const userStore = useUserStore() const settingsStore = useSettingsStore() diff --git a/src/utils/dict.ts b/src/utils/dict.ts index e5595b2..98887ba 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -76,13 +76,11 @@ export function comDict(...args: string[]): Promise { } else { // 缓存不存在,发起请求并记录 Promise const promise = getComDicts({ - dict_type: dictType + dictType: dictType }).then((resp: any) => { const dictList = resp.data.map((p: any) => ({ - label: p.dictName, - value: p.dictCode, - elTagType: "", - elTagClass: "" + label: p.wordbook_name, + value: p.wordbook_code, })); res.value[dictType] = dictList; diff --git a/src/views/doctor/application/index.vue b/src/views/doctor/application/index.vue index e03ea20..63526f5 100644 --- a/src/views/doctor/application/index.vue +++ b/src/views/doctor/application/index.vue @@ -1,250 +1,356 @@ -/** -* @file bloodTransfusionApplication.vue -* @description: 输血申请 -* @author: w -* @since: 2026-06-04 -*/ - \ No newline at end of file diff --git a/src/views/doctor/assessment/index.vue b/src/views/doctor/assessment/index.vue index 6f7e2ac..1385315 100644 --- a/src/views/doctor/assessment/index.vue +++ b/src/views/doctor/assessment/index.vue @@ -7,265 +7,286 @@ \ No newline at end of file diff --git a/src/views/doctor/deptPatient/index.vue b/src/views/doctor/deptPatient/index.vue index 3014eee..b637281 100644 --- a/src/views/doctor/deptPatient/index.vue +++ b/src/views/doctor/deptPatient/index.vue @@ -11,7 +11,7 @@