From b24b232493dea3785d6100a9eef3018b4fc640d7 Mon Sep 17 00:00:00 2001 From: wyuu Date: Mon, 24 Nov 2025 18:03:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=97=E7=94=9F=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/liswork/micro/index.ts | 48 +++ src/assets/styles/btn.scss | 16 + src/assets/styles/ruoyi.scss | 5 - src/types/Object.d.ts | 23 ++ src/views/liswork/micro/index.vue | 51 ++- .../liswork/micro/labresult/cbReport.vue | 272 ++++++++++++++- .../micro/labresult/components/kssMb.vue | 159 +++++++++ .../micro/labresult/components/meddict.vue | 159 +++++++++ src/views/liswork/micro/labresult/record.vue | 4 +- .../liswork/micro/labresult/zbReport.vue | 313 ++++++++++++++---- 10 files changed, 952 insertions(+), 98 deletions(-) create mode 100644 src/views/liswork/micro/labresult/components/kssMb.vue create mode 100644 src/views/liswork/micro/labresult/components/meddict.vue diff --git a/src/api/liswork/micro/index.ts b/src/api/liswork/micro/index.ts index cb1ca07..b2f4fe2 100644 --- a/src/api/liswork/micro/index.ts +++ b/src/api/liswork/micro/index.ts @@ -75,4 +75,52 @@ export function saveresult(data?: Object) { method: 'post', data }) +} +//获取药敏字典 +export function getmeddictList(data?: Object) { + return request({ + url: '/lisworkgerm/getmeddict', + method: 'get', + params: data + }) +} +//获取药敏模板 +export function getmedgroupList(data?: Object) { + return request({ + url: '/lisworkgerm/getmedgrouplist', + method: 'get', + params: data + }) +} +//获取药敏模板明细 +export function getmedgroupMbList(data?: Object) { + return request({ + url: '/lisworkgerm/getmedgroup', + method: 'get', + params: data + }) +} +//保存药敏结果 +export function savemedresult(data?: Object) { + return request({ + url: '/lisworkgerm/savemedresult', + method: 'post', + data + }) +} +//保存所有药敏结果 +export function savemedresultall(data?: Object) { + return request({ + url: '/lisworkgerm/savemedresultall', + method: 'post', + data + }) +} +//删除药敏结果 +export function deletemedresult(data?: Object) { + return request({ + url: '/lisworkgerm/deletemedresult', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss index 3590d8d..595ec48 100644 --- a/src/assets/styles/btn.scss +++ b/src/assets/styles/btn.scss @@ -97,3 +97,19 @@ font-size: 14px; border-radius: 4px; } + + +.btn_green { + background-color: #aef5ef !important; + color: #148A7F; + border-color: #aef5ef; +} + +.btns_box { + padding: .3125rem .625rem !important; + font-size: .875rem; + height: 1.25rem !important; + margin: 5px 0; + margin-left: .625rem !important; + border-radius: 0 !important; +} \ No newline at end of file diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 563193f..2fe9c33 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -337,11 +337,6 @@ cursor: pointer; } - .btn_green { - background-color: #aef5ef !important; - color: #148A7F; - border-color: #aef5ef; - } // 表格input宽度,表格select宽度 .full-width-input .el-input__inner .el-select__inner { diff --git a/src/types/Object.d.ts b/src/types/Object.d.ts index 25f3759..f026efd 100644 --- a/src/types/Object.d.ts +++ b/src/types/Object.d.ts @@ -126,4 +126,27 @@ export class XmInfoVs { ckxx?: number; dyckz?: string; +} + + +export class LabResultItem { + xmdh: string; + xmmc: string; + csjg: string; + qz: string; + [key: string]: any; +} + +export class ymTableDataItem { + zhywdh: string; + ywdh: any; + ywmc: any; + mic: string; + rad: string; + csjg: string; + jgbz: string; + ckz: string; + bz: string; + txtresult: string; + cp_bz: string; } \ No newline at end of file diff --git a/src/views/liswork/micro/index.vue b/src/views/liswork/micro/index.vue index 682311a..840da0c 100644 --- a/src/views/liswork/micro/index.vue +++ b/src/views/liswork/micro/index.vue @@ -52,11 +52,13 @@ - + @@ -95,15 +97,16 @@
- - 所有 + + 所有 近30天 近60天 近90天 近7天 - 此日 -> + 此日 -> - +
@@ -186,7 +189,7 @@ const queryParams = ref({ ybh: '', instrGroup: '04', problemId: 0, - days: 90, + days: -1, pageSize: 600, pageNum: 1 }) @@ -252,6 +255,11 @@ interface QueryParams { watch(() => labPat.value, (newValue) => { queryParams.value.ybh = newValue.ybh; + // if (newValue.jgbz == '2') { + // activeName.value = 'first' + // } else if (newValue.jgbz == '0' || newValue.jgbz == '3' || newValue.jgbz == '4') { + // activeName.value = 'second' + // } }, { deep: true }); // 模糊查询 @@ -281,7 +289,8 @@ const searchQuery = () => { } else { labPat.value = {}; labInfo.value = {}; - labResuts.value = []; + zbLabResuts.value = []; + cbLabResuts.value = []; highlightRowIndex.value = -1; } }; @@ -321,7 +330,8 @@ const handleQueryResult = (params: QueryParams) => { } else { labPat.value = {}; labInfo.value = {}; - labResuts.value = []; + zbLabResuts.value = []; + cbLabResuts.value = []; highlightRowIndex.value = -1; } }; @@ -344,7 +354,8 @@ const handleinstrGroupChange = (val: any) => { } const mbStore = useCommonStore(); const yqHandleChange = (val: any) => { - labResuts.value = [] + zbLabResuts.value = []; + cbLabResuts.value = []; labPat.value = {} labInfo.value = {} mbStore.setLxsrList([]); @@ -402,11 +413,20 @@ const selectJob = (job: any) => { fetchLabResults(); highlightRowIndex.value = labPatList.value.findIndex((item: any) => item.ybh == labInfo.value.ybh); } -const labResuts = ref([]) +const zbLabResuts = ref([]) +const cbLabResuts = ref([]) //载入样本结果表单(中间labresult.vue组件) const fetchLabResults = async () => { sampleMedInfo({ jyrq: labInfo.value.jyrq ? labInfo.value.jyrq : queryParams.value.jyrq, yq: labInfo.value.yq, ybh: labInfo.value.ybh }).then((response: any) => { - labResuts.value = response.data; + zbLabResuts.value = response.data; + if (labPat.value.jgbz == '2') { + } + if (labPat.value.jgbz == '3') { + cbLabResuts.value = response.data; + } + + console.log(' zbLabResuts.value==>', zbLabResuts.value); + console.log(' cbLabResuts.value==>', cbLabResuts.value); }) } @@ -466,7 +486,8 @@ const handleCreate = () => { labPat.value = response.data; labInfo.value = response.data; labPat.value.id = `temp_${Date.now()}_${Math.random().toString(36).substr(2, 8)}`; - labResuts.value = [] + zbLabResuts.value = []; + cbLabResuts.value = []; labPatListRef.value?.clearCurrentRow(); fetchLabResults() } @@ -721,7 +742,7 @@ onMounted(async () => { GMC: toRaw(dictRefs.GMC.value) || [], }; // 初始化Socket - initSocket() + // initSocket() }); const initSocket = () => { @@ -797,7 +818,7 @@ const sendMessage = () => { margin: .125rem 0; .el-radio { - margin-right: 15px; + margin-right: .3125rem; } } diff --git a/src/views/liswork/micro/labresult/cbReport.vue b/src/views/liswork/micro/labresult/cbReport.vue index cedd1fd..ba3782e 100644 --- a/src/views/liswork/micro/labresult/cbReport.vue +++ b/src/views/liswork/micro/labresult/cbReport.vue @@ -1,33 +1,154 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/liswork/micro/labresult/components/kssMb.vue b/src/views/liswork/micro/labresult/components/kssMb.vue new file mode 100644 index 0000000..97d90f9 --- /dev/null +++ b/src/views/liswork/micro/labresult/components/kssMb.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/src/views/liswork/micro/labresult/components/meddict.vue b/src/views/liswork/micro/labresult/components/meddict.vue new file mode 100644 index 0000000..7cc0085 --- /dev/null +++ b/src/views/liswork/micro/labresult/components/meddict.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/src/views/liswork/micro/labresult/record.vue b/src/views/liswork/micro/labresult/record.vue index a107b19..692c266 100644 --- a/src/views/liswork/micro/labresult/record.vue +++ b/src/views/liswork/micro/labresult/record.vue @@ -51,7 +51,9 @@ const getRecordList = () => { } watch(() => props.labPat, (newValue) => { - getRecordList() + if (newValue.jyrq && newValue.ybh && newValue.yq) { + getRecordList() + } }) diff --git a/src/views/liswork/micro/labresult/zbReport.vue b/src/views/liswork/micro/labresult/zbReport.vue index bf72e15..f408cd5 100644 --- a/src/views/liswork/micro/labresult/zbReport.vue +++ b/src/views/liswork/micro/labresult/zbReport.vue @@ -1,14 +1,14 @@
- + - + + + + + + + + + + @@ -77,12 +111,12 @@