wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into guanyu

Browse Source
This commit is contained in:
华佗
2026-06-16 13:18:22 +08:00
parent a7378ceef7 fef1ca6637
commit 8808ba1663
2 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
healthlink-his-ui/src/views/inpatientNurse/inOut/components/transferOut.vue
View File

@@ -273,7 +273,15 @@
</vxe-column>
<vxe-column title="医嘱状态" align="center" width="120">
<template #default="scope">
{{ scope.row.requestStatus_enumText || '-' }}
<el-tag v-if="scope.row.requestStatus == 6" type="danger">停止</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 13" type="warning">已停嘱(待核对)</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 2" type="success">已签发</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 1" type="primary">待签发</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 10" type="primary">已校对</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 11" type="primary">待接收</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 3" type="success">已校对</el-tag>
<el-tag v-else-if="scope.row.requestStatus == 20" type="success">已完成</el-tag>
<el-tag v-else type="info">{{ scope.row.requestStatus_enumText || '-' }}</el-tag>
</template>
</vxe-column>
<vxe-column title="执行科室" align="center" min-width="120">

36
healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
View File

@@ -235,19 +235,39 @@
field="singleDose"
width="100"
align="center"
/>
>
<template #default="scope">
{{ scope.row.singleDose ? scope.row.singleDose + ' ' + (scope.row.doseUnitCode_dictText || '') : '' }}
</template>
</vxe-column>
<vxe-column
title="总量"
field="totalAmount"
width="100"
align="center"
/>
>
<template #default="scope">
{{ scope.row.totalAmount }} {{ scope.row.unitCode_dictText || '' }}
</template>
</vxe-column>
<vxe-column
title="频次/用法"
field="frequencyUsage"
width="110"
width="130"
align="center"
/>
>
<template #default="scope">
{{
[
scope.row.rateCode_dictText,
scope.row.dispensePerDuration ? scope.row.dispensePerDuration + '天' : '',
scope.row.methodCode_dictText,
]
.filter(Boolean)
.join(' ')
}}
</template>
</vxe-column>
<vxe-column
title="皮试"
field="skinTestStatus"
@@ -283,10 +303,14 @@
</vxe-column>
<vxe-column
title="开嘱医生"
field="orderingDoctor"
field="requesterId_dictText"
width="100"
align="center"
/>
>
<template #default="scope">
{{ scope.row.requesterId_dictText || scope.row.orderingDoctor || '-' }}
</template>
</vxe-column>
<vxe-column
title="退回原因"
field="reasonText"