diff --git a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue index 963c73d2..36b02de3 100755 --- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue @@ -174,7 +174,6 @@ const activeNames = ref([]); const userStore = useUserStore(); const prescriptionList = ref([]); const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59'); -const therapyEnum = ref(undefined); const { proxy } = getCurrentInstance(); const loading = ref(false); const chooseAll = ref(false); @@ -190,6 +189,10 @@ const props = defineProps({ deadline: { type: String, }, + therapyEnum: { + type: Number, + default: undefined, + }, }); function handleGetPrescription() { @@ -200,7 +203,7 @@ function handleGetPrescription() { encounterIds: encounterIds, pageSize: 10000, pageNo: 1, - therapyEnum: therapyEnum.value, + therapyEnum: props.therapyEnum, exeStatus: props.exeStatus, requestStatus: props.requestStatus, }) diff --git a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue index e9deacfa..b8475ce2 100755 --- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue @@ -58,7 +58,7 @@ :clearable="false" @change="handleGetPrescription" /> - + 全部 长期 临时 @@ -79,6 +79,7 @@ :exeStatus="exeStatus" :requestStatus="requestStatus" :deadline="deadline" + :therapyEnum="therapyEnum" />