diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue index de262b3f..e8b49108 100644 --- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue +++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue @@ -335,6 +335,7 @@ import useUserStore from '@/store/modules/user'; import {getGroupMarkers} from '@/utils/his'; import {PRINT_TEMPLATE, simplePrint} from '@/utils/printUtils.js'; +import {ElMessage} from "element-plus"; // 患者搜索 const queryParams = ref({ pageNo: 1, @@ -462,6 +463,7 @@ function getAllList(row) { }); activityList.value = getGroupMarkers(activityList.value); deviceActivityList.value = res.data.records.filter((item) => { + console.info('item=====>', JSON.stringify(item)); return item.deviceCategory == '7' || item.serviceCategory == '21'; }); loading.value = false; @@ -690,22 +692,31 @@ function getEnPrescription() { // 打印处置单 function printDisposal() { - let requestIds = deviceActivityList.value + let requestIds = deviceActivityList.value && deviceActivityList.value.length > 0 + ? deviceActivityList.value .map((item) => { return item.requestId; }) - .join(','); - advicePrint({ requestIds: requestIds }).then((res) => { - const result = res.data; - const printElements = JSON.parse( - JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName) - ); - var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板 - hiprintTemplate.print2(result, { - height: 210, - width: 148, + .join(',') : ''; + if (requestIds !== '') { + advicePrint({ requestIds: requestIds }).then((res) => { + const result = res.data; + const printElements = JSON.parse( + JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName) + ); + var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板 + hiprintTemplate.print2(result, { + height: 210, + width: 148, + }); }); - }); + } else { + ElMessage({ + type: 'error', + message: '暂无处置单', + }); + } + } // 判断是否为组内的第一行