diff --git a/src/api/regional/dict/diagnosis.js b/src/api/regional/dict/diagnosis.js new file mode 100644 index 0000000..3c2f72d --- /dev/null +++ b/src/api/regional/dict/diagnosis.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询诊断列表 +export function listdiagnosis(query) { + return request({ + url: '/transitdict/diagnosis/list', + method: 'get', + params: query + }) +} + +// 查询诊断详细 +export function getdiagnosis(diagnosisId) { + return request({ + url: '/transitdict/diagnosis/' + diagnosisId, + method: 'get' + }) +} + +// 新增诊断 +export function adddiagnosis(data) { + return request({ + url: '/transitdict/diagnosis', + method: 'post', + data: data + }) +} + +// 修改诊断 +export function updatediagnosis(data) { + return request({ + url: '/transitdict/diagnosis', + method: 'put', + data: data + }) +} + +// 删除诊断 +export function deldiagnosis(diagnosisId) { + return request({ + url: '/transitdict/diagnosis/' + diagnosisId, + method: 'delete' + }) +} diff --git a/src/api/regional/dict/hospital.js b/src/api/regional/dict/hospital.js new file mode 100644 index 0000000..797dfd6 --- /dev/null +++ b/src/api/regional/dict/hospital.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询医疗机构列表 +export function listhospital(query) { + return request({ + url: '/transitdict/hospital/list', + method: 'get', + params: query + }) +} + +// 查询医疗机构详细 +export function gethospital(hospitalId) { + return request({ + url: '/transitdict/hospital/' + hospitalId, + method: 'get' + }) +} + +// 新增医疗机构 +export function addhospital(data) { + return request({ + url: '/transitdict/hospital', + method: 'post', + data: data + }) +} + +// 修改医疗机构 +export function updatehospital(data) { + return request({ + url: '/transitdict/hospital', + method: 'put', + data: data + }) +} + +// 删除医疗机构 +export function delhospital(hospitalId) { + return request({ + url: '/transitdict/hospital/' + hospitalId, + method: 'delete' + }) +} diff --git a/src/api/regional/dict/itemclass.js b/src/api/regional/dict/itemclass.js new file mode 100644 index 0000000..44b6fa3 --- /dev/null +++ b/src/api/regional/dict/itemclass.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询诊断列表 +export function listitemclass(query) { + return request({ + url: '/transitdict/itemclass/list', + method: 'get', + params: query + }) +} + +// 查询诊断详细 +export function getitemclass(itemclassId) { + return request({ + url: '/transitdict/itemclass/' + itemclassId, + method: 'get' + }) +} + +// 新增诊断 +export function additemclass(data) { + return request({ + url: '/transitdict/itemclass', + method: 'post', + data: data + }) +} + +// 修改诊断 +export function updateitemclass(data) { + return request({ + url: '/transitdict/itemclass', + method: 'put', + data: data + }) +} + +// 删除诊断 +export function delitemclass(itemclassId) { + return request({ + url: '/transitdict/itemclass/' + itemclassId, + method: 'delete' + }) +} diff --git a/src/api/regional/dict/regdict.js b/src/api/regional/dict/regdict.js new file mode 100644 index 0000000..57c3ffb --- /dev/null +++ b/src/api/regional/dict/regdict.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询字典列表 +export function listregdict(query) { + return request({ + url: '/transitdict/regdict/list', + method: 'get', + params: query + }) +} + +// 查询字典详细 +export function getregdict(regdictId) { + return request({ + url: '/transitdict/regdict/' + regdictId, + method: 'get' + }) +} + +// 新增字典 +export function addregdict(data) { + return request({ + url: '/transitdict/regdict', + method: 'post', + data: data + }) +} + +// 修改字典 +export function updateregdict(data) { + return request({ + url: '/transitdict/regdict', + method: 'put', + data: data + }) +} + +// 删除字典 +export function delregdict(regdictId) { + return request({ + url: '/transitdict/regdict/' + regdictId, + method: 'delete' + }) +} diff --git a/src/api/regional/index.ts b/src/api/regional/index.ts new file mode 100644 index 0000000..131da76 --- /dev/null +++ b/src/api/regional/index.ts @@ -0,0 +1,51 @@ +// @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 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 + }) +} \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 4b4ba9d..10bf9a5 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -189,7 +189,7 @@ aside { .el-form-item__label { padding-bottom: 0px; color: #08355E; - font-size: 12px; + font-size: .75rem; } // pointer-events: none; @@ -213,4 +213,77 @@ aside { .flex-between { display: flex; justify-content: space-between; +} + + +.time-line-box { + display: flex; + justify-content: space-around; + align-items: center; + margin-top: .35rem; + background-color: #f0f3f8; + padding: .3rem 2.5rem; + + + .time-line-item { + display: flex; + align-items: center; + justify-content: space-around; + width: 16.6%; + + .timeline-content { + display: flex; + flex-direction: column; + align-items: center; + + .index { + width: 1.875rem; + height: 1.875rem; + line-height: 1.875rem; + background: #E1E9F7; + border-radius: 50%; + text-align: center; + font-family: SourceHanSansCN, SourceHanSansCN; + font-weight: 500; + font-size: 1.125rem; + color: #4767A3; + } + + .active { + background-color: #4096ff; + box-shadow: 0 0 0 .25rem rgba(64, 150, 255, 0.2); + color: #FFF; + } + + + + .timeline-title { + font-family: SourceHanSansCN, SourceHanSansCN; + font-weight: 500; + font-size: 1rem; + color: #4767A3; + } + + .timeline-time { + font-family: SourceHanSansCN, SourceHanSansCN; + font-weight: 400; + font-size: .875rem; + color: #4767A3; + height: 1rem; + } + + } + + .no_active { + + .index, + .timeline-title { + color: #9b9999 !important; + } + } + + .timg { + width: 3.125rem; + } + } } \ No newline at end of file diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index c449373..563193f 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -162,6 +162,11 @@ line-height: 30px; } + .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; height: 30px; diff --git a/src/components/elTable/index.vue b/src/components/elTable/index.vue index cdffaa4..58c924d 100644 --- a/src/components/elTable/index.vue +++ b/src/components/elTable/index.vue @@ -61,7 +61,7 @@
import { computed, ref, watch, PropType, onMounted } from "vue"; import { TableColumnCtx } from 'element-plus'; +import { classCom } from "@/utils/classCom"; +const aotuSize = classCom.useAutoSize(); // @ts-ignore import Sortable from 'sortablejs'; // 引入sortablejs interface TableColumn { @@ -395,8 +397,7 @@ defineExpose({ display: flex; align-items: center; justify-content: flex-end; - padding: 12px 0; - margin-top: 16px; + padding: .3125rem 0; margin-right: 20px; } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 863417f..eda6c7e 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -1,17 +1,10 @@