From 867a46d933d68e355ac116a4e3134c2de792278a Mon Sep 17 00:00:00 2001 From: wuyy Date: Wed, 16 Sep 2026 17:45:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DropdownTableSelect/index.vue | 3 ++- src/views/blood/clinical/index.vue | 12 +++++++++--- src/views/blood/crossMatching/index.vue | 11 ++++++++--- src/views/blood/recheck/index.vue | 14 +++++++++++--- src/views/blood/urgent/index.vue | 2 +- src/views/doctor/application/index.vue | 6 ++++-- vite.config.ts | 2 +- 7 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/components/DropdownTableSelect/index.vue b/src/components/DropdownTableSelect/index.vue index 0afc4d1..6c2e295 100644 --- a/src/components/DropdownTableSelect/index.vue +++ b/src/components/DropdownTableSelect/index.vue @@ -152,7 +152,8 @@ const processTableData = (data: TableRowItem[]) => { // 所有列都生成拼音用于检索 props.columnList.forEach((field) => { if (item[field.prop]) { - pinyinMap[field.prop] = getFirstLetter(item[field.prop]).toLowerCase(); + //处理列数据是数组时，不处理 + pinyinMap[field.prop] = Array.isArray(item[field.prop]) ? item[field.prop] : getFirstLetter(item[field.prop]).toLowerCase(); } }); return { ...item, pinyinMap }; diff --git a/src/views/blood/clinical/index.vue b/src/views/blood/clinical/index.vue index 64c97a8..d22c7ef 100644 --- a/src/views/blood/clinical/index.vue +++ b/src/views/blood/clinical/index.vue @@ -1,8 +1,8 @@ /** * @file index.vue -* @description: 交叉配血 +* @description: 临床发血 * @author: w -* @since: 2026-06-18 +* @since: 2026-06-20 */ @@ -846,6 +846,12 @@ const getSqdInfo = () => { }) } +const formatBreed = (breeds: Array) => { + return breeds.map(item => { + const match = bloodBreed.value.find(v => v.value === item) + return match ? match.label : item + }).join('、') +} onMounted(() => { getDictData('ks', 'bq', 'sxmd', 'billApplyStatus', 'ktsx', 'abotype', 'subgroup', 'sxzz', 'rhtype', 'pxff', 'pxjg', 'zccc', 'test_result') diff --git a/src/views/blood/crossMatching/index.vue b/src/views/blood/crossMatching/index.vue index 15a06ce..0713eeb 100644 --- a/src/views/blood/crossMatching/index.vue +++ b/src/views/blood/crossMatching/index.vue @@ -41,7 +41,7 @@ {{ formatDict(row.dept_id, 'ks') }} @@ -106,7 +106,6 @@ -
@@ -779,6 +778,7 @@ const saveBloodApply = () => { saveBloodData(params).then(res => { saveLoading.value = false if (res.code == 0) { + bloodInfo.value.bill_no = res.data handleRefresh() ElMessage.success(res.msg) } @@ -864,7 +864,12 @@ const searchApply = () => { }) } - +const formatBreed = (breeds: Array) => { + return breeds.map(item => { + const match = bloodBreed.value.find(v => v.value === item) + return match ? match.label : item + }).join('、') +} onMounted(() => { diff --git a/src/views/blood/recheck/index.vue b/src/views/blood/recheck/index.vue index 18d58a4..d2fe68f 100644 --- a/src/views/blood/recheck/index.vue +++ b/src/views/blood/recheck/index.vue @@ -43,13 +43,14 @@ @@ -477,7 +478,7 @@ const applyColumns = ref([ { label: '申请单号', prop: 'bill_no' }, { label: '患者姓名', prop: 'patient_name' }, { label: '科室', prop: 'dept_id', slotName: 'dept_id' }, - { label: '申请品种', prop: 'blood_breed', slotName: 'blood_breed' } + { label: '申请品种', prop: 'blood_breed', slotName: 'blood_breed', width: 250 } ]) const applyTableData = ref([]) @@ -680,6 +681,13 @@ const getTime = () => { }) } +const formatBreed = (breeds: Array) => { + return breeds.map(item => { + const match = bloodBreed.value.find(v => v.value === item) + return match ? match.label : item + }).join('、') +} + onMounted(() => { getDictData('ks', 'bq', 'abotype', 'rhtype', 'sxmd', 'sxzz', 'billApplyStatus', 'subgroup', 'ktsx') getUserData() diff --git a/src/views/blood/urgent/index.vue b/src/views/blood/urgent/index.vue index 464c275..4d14366 100644 --- a/src/views/blood/urgent/index.vue +++ b/src/views/blood/urgent/index.vue @@ -22,7 +22,7 @@ + tableWidth="500px" :table-data="applyTableData" @open="loadApplyData" @search="handleApplySearch" /> diff --git a/src/views/doctor/application/index.vue b/src/views/doctor/application/index.vue index 7bc7fa7..8fd5c58 100644 --- a/src/views/doctor/application/index.vue +++ b/src/views/doctor/application/index.vue @@ -1052,9 +1052,11 @@ const goHistoryBlood = () => { // 打开新增弹窗 const openBloodDialog = () => { editIndex.value = -1 - resetBloodForm() - bloodForm.apply_bloodtype = xkPatientInfo.value.abo bloodDialogVisible.value = true + resetBloodForm() + bloodForm.intent = bloodList.value.length ? bloodList.value[0].intent : '' + bloodForm.causalis = bloodList.value.length ? bloodList.value[0].causalis : '' + bloodForm.apply_bloodtype = xkPatientInfo.value.abo } // 重置弹窗表单 const resetBloodForm = () => { diff --git a/vite.config.ts b/vite.config.ts index 94a86bb..772a24d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -48,7 +48,7 @@ export default defineConfig(({ mode, command }) => { proxy: { // https://cn.vitejs.dev/config/#server-proxy "/dev-api": { - // target: "http://47.97.125.165:8905", + // target: "http://localhost:8907", target: "http://47.97.125.165:8907", changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, ""),