From ea9acac58966c725127a0fa72bfa7db3f6918428 Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 17:56:03 +0800 Subject: [PATCH] =?UTF-8?q?778=20=E3=80=90=E9=97=A8=E8=AF=8A=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E7=AB=99-=E6=A3=80=E9=AA=8C=E3=80=91=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=80=89=E4=B8=AD=E8=A1=8C=E6=A3=80=E9=AA=8C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8D=95=EF=BC=8C=E4=B8=8B=E6=96=B9=E2=80=9C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8D=95=E2=80=9D=E8=A1=A8=E5=8D=95=E5=92=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=80=89=E6=8B=A9=E5=8C=BA=E5=9F=9F=E6=9C=AA=E5=9B=9E?= =?UTF-8?q?=E6=98=BE/=E7=BB=91=E5=AE=9A=E5=AF=B9=E5=BA=94=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/inspectionApplication.vue | 18 +++++++++--------- .../src/views/emergency/observation/index.vue | 2 +- .../src/views/emergency/triage/index.vue | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue b/healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue index 094e6f6b5..96a7e016d 100755 --- a/healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue +++ b/healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue @@ -2395,9 +2395,9 @@ const handleCurrentChange = (page) => { getInspectionList() } -// 选择框变化 -const handleSelectionChange = (selection) => { - selectedRows.value = selection +// 选择框变化（vxe-table v4 事件参数为 { records, reserves, row, rowIndex, checked, $event }） +const handleSelectionChange = ({ records }) => { + selectedRows.value = records || [] } const handlePrint = (row) => { @@ -2456,11 +2456,11 @@ const handleDelete = (row) => { }) } -// 单元格点击 - 点击表格行时加载申请单详情 -const handleCellClick = (row, column) => { - // 如果点击的是操作列或展开列，不触发数据填充 +// 单元格点击 - 点击表格行时加载申请单详情（vxe-table v4 事件参数为 { row, column, ... }） +const handleCellClick = ({ row, column }) => { + // 如果点击的是操作列、展开列或选择列，不触发数据填充 if (column.property === '操作' || column.label === '操作' || - column.type === 'expand' || column.type === 'selection') { + column.type === 'expand' || column.type === 'selection' || column.type === 'checkbox') { return; } // 点击表格行时，将该申请单的数据加载到表单中 @@ -2470,8 +2470,8 @@ const handleCellClick = (row, column) => { } } -// 行点击事件处理 -const handleRowClick = (currentRow, oldRow) => { +// 行点击事件处理（vxe-table v4 事件参数为 { row, rowIndex, $event }） +const handleRowClick = ({ row: currentRow }) => { // 点击表格行时，将该申请单的数据加载到表单中 // 使用 applyNo 判断是否有效，同时检查是否处于删除状态 if (currentRow && currentRow.applyNo && !isDeleting.value) { diff --git a/healthlink-his-ui/src/views/emergency/observation/index.vue b/healthlink-his-ui/src/views/emergency/observation/index.vue index 6383f2307..9ca0a44ac 100644 --- a/healthlink-his-ui/src/views/emergency/observation/index.vue +++ b/healthlink-his-ui/src/views/emergency/observation/index.vue @@ -104,7 +104,7 @@ :type="row.disposition==='ADMIT'?'warning':row.disposition==='DEATH'?'danger':'success'" size="small" > - {{ {$t('emergency.observation.dispAdmit'):t('emergency.observation.dispAdmit'),$t('emergency.observation.dispDischarge'):t('emergency.observation.dispDischarge'),$t('emergency.observation.dispTransfer'):t('emergency.observation.dispTransfer'),$t('emergency.observation.dispDeath'):t('emergency.observation.dispDeath')}[row.disposition]||row.disposition }} + {{ { ADMIT: $t('emergency.observation.dispAdmit'), DISCHARGE: $t('emergency.observation.dispDischarge'), TRANSFER: $t('emergency.observation.dispTransfer'), DEATH: $t('emergency.observation.dispDeath') }[row.disposition] || row.disposition }} - {{ {$t('emergency.triage.statusWaiting'):'待诊',$t('emergency.triage.statusInTreatment'):'就诊中',$t('emergency.triage.statusCompleted'):'已完成'}[row.status]||row.status }} + {{ { WAITING: $t('emergency.triage.statusWaiting'), IN_TREATMENT: $t('emergency.triage.statusInTreatment'), COMPLETED: $t('emergency.triage.statusCompleted') }[row.status] || row.status }}